diff options
1058 files changed, 26484 insertions, 11043 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 3c2ae5a03004..da15c269a19f 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -95,6 +95,7 @@ aconfig_declarations_group { "com.android.internal.foldables.flags-aconfig-java", "com.android.internal.os.flags-aconfig-java", "com.android.internal.pm.pkg.component.flags-aconfig-java", + "com.android.internal.widget.flags-aconfig-java", "com.android.media.flags.bettertogether-aconfig-java", "com.android.media.flags.editing-aconfig-java", "com.android.media.flags.performance-aconfig-java", @@ -279,6 +280,19 @@ java_aconfig_library { defaults: ["framework-minus-apex-aconfig-java-defaults"], } +aconfig_declarations { + name: "com.android.internal.widget.flags-aconfig", + package: "com.android.internal.widget.flags", + container: "system", + srcs: ["core/java/com/android/internal/widget/*.aconfig"], +} + +java_aconfig_library { + name: "com.android.internal.widget.flags-aconfig-java", + aconfig_declarations: "com.android.internal.widget.flags-aconfig", + defaults: ["framework-minus-apex-aconfig-java-defaults"], +} + // Text aconfig_declarations { name: "com.android.text.flags-aconfig", @@ -1220,6 +1234,17 @@ java_aconfig_library { } java_aconfig_library { + name: "device_policy_aconfig_flags_java_export", + aconfig_declarations: "device_policy_aconfig_flags", + defaults: ["framework-minus-apex-aconfig-java-defaults"], + min_sdk_version: "30", + apex_available: [ + "//apex_available:platform", + "com.android.permission", + ], +} + +java_aconfig_library { name: "device_policy_aconfig_flags_lib_host", aconfig_declarations: "device_policy_aconfig_flags", host_supported: true, diff --git a/apex/jobscheduler/service/aconfig/job.aconfig b/apex/jobscheduler/service/aconfig/job.aconfig index 810be8fc4220..fe95a59622f4 100644 --- a/apex/jobscheduler/service/aconfig/job.aconfig +++ b/apex/jobscheduler/service/aconfig/job.aconfig @@ -63,7 +63,7 @@ flag { name: "remove_user_during_user_switch" namespace: "backstage_power" description: "Remove started user if user will be stopped due to user switch" - bug: "321598070" + bug: "337077643" } flag { diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp index 58763a7f9aca..d9ff19051de9 100644 --- a/cmds/idmap2/Android.bp +++ b/cmds/idmap2/Android.bp @@ -165,6 +165,7 @@ cc_test { ], host_supported: true, test_suites: ["general-tests"], + require_root: true, srcs: [ "tests/BinaryStreamVisitorTests.cpp", "tests/CommandLineOptionsTests.cpp", diff --git a/cmds/idmap2/libidmap2/ResourceContainer.cpp b/cmds/idmap2/libidmap2/ResourceContainer.cpp index 57ae3548123b..f22a481c1f28 100644 --- a/cmds/idmap2/libidmap2/ResourceContainer.cpp +++ b/cmds/idmap2/libidmap2/ResourceContainer.cpp @@ -22,6 +22,7 @@ #include <utility> #include <vector> +#include "android-base/scopeguard.h" #include "androidfw/ApkAssets.h" #include "androidfw/AssetManager.h" #include "androidfw/Util.h" @@ -269,27 +270,40 @@ struct ResState { std::unique_ptr<AssetManager2> am; ZipAssetsProvider* zip_assets; - static Result<ResState> Initialize(std::unique_ptr<ZipAssetsProvider> zip, + static Result<ResState> Initialize(std::unique_ptr<ZipAssetsProvider>&& zip, package_property_t flags) { ResState state; state.zip_assets = zip.get(); if ((state.apk_assets = ApkAssets::Load(std::move(zip), flags)) == nullptr) { - return Error("failed to load apk asset"); + return Error("failed to load apk asset for '%s'", + state.zip_assets->GetDebugName().c_str()); } + // Make sure we put ZipAssetsProvider where we took it if initialization fails, so the + // original object stays valid for any next call it may get. + auto scoped_restore_zip_assets = android::base::ScopeGuard([&zip, &state]() { + zip = std::unique_ptr<ZipAssetsProvider>( + static_cast<ZipAssetsProvider*>( + std::move(const_cast<ApkAssets&>(*state.apk_assets)).TakeAssetsProvider().release())); + }); + if ((state.arsc = state.apk_assets->GetLoadedArsc()) == nullptr) { - return Error("failed to retrieve loaded arsc"); + return Error("failed to retrieve loaded arsc for '%s'", + state.zip_assets->GetDebugName().c_str()); } if ((state.package = GetPackageAtIndex0(state.arsc)) == nullptr) { - return Error("failed to retrieve loaded package at index 0"); + return Error("failed to retrieve loaded package at index 0 for '%s'", + state.zip_assets->GetDebugName().c_str()); } state.am = std::make_unique<AssetManager2>(); if (!state.am->SetApkAssets({state.apk_assets}, false)) { - return Error("failed to create asset manager"); + return Error("failed to create asset manager for '%s'", + state.zip_assets->GetDebugName().c_str()); } + scoped_restore_zip_assets.Disable(); return state; } }; diff --git a/cmds/idmap2/tests/IdmapTests.cpp b/cmds/idmap2/tests/IdmapTests.cpp index 1b656e8c2088..7093614f4047 100644 --- a/cmds/idmap2/tests/IdmapTests.cpp +++ b/cmds/idmap2/tests/IdmapTests.cpp @@ -214,6 +214,20 @@ TEST(IdmapTests, CreateIdmapHeaderFromApkAssets) { ASSERT_EQ(idmap->GetHeader()->GetOverlayName(), TestConstants::OVERLAY_NAME_ALL_POLICIES); } +TEST(IdmapTests, TargetContainerWorksAfterError) { + auto target = TargetResourceContainer::FromPath(GetTestDataPath() + "/target/target-bad.apk"); + ASSERT_TRUE(target); + + auto crc = target->get()->GetCrc(); + ASSERT_TRUE(crc); + + // This call tries to construct the full ApkAssets state, and fails. + ASSERT_FALSE(target->get()->DefinesOverlayable()); + auto crc2 = target->get()->GetCrc(); + ASSERT_TRUE(crc2); + EXPECT_EQ(*crc, *crc2); +} + TEST(IdmapTests, CreateIdmapDataFromApkAssets) { std::string target_apk_path = GetTestDataPath() + "/target/target.apk"; std::string overlay_apk_path = GetTestDataPath() + "/overlay/overlay.apk"; diff --git a/cmds/idmap2/tests/data/target/target-bad.apk b/cmds/idmap2/tests/data/target/target-bad.apk Binary files differnew file mode 100644 index 000000000000..fd8678238c4d --- /dev/null +++ b/cmds/idmap2/tests/data/target/target-bad.apk diff --git a/core/api/current.txt b/core/api/current.txt index 88180e526065..0fe8717e8954 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -140,6 +140,7 @@ package android { field public static final String MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL = "android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL"; field public static final String MANAGE_DEVICE_POLICY_AIRPLANE_MODE = "android.permission.MANAGE_DEVICE_POLICY_AIRPLANE_MODE"; field public static final String MANAGE_DEVICE_POLICY_APPS_CONTROL = "android.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL"; + field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String MANAGE_DEVICE_POLICY_APP_FUNCTIONS = "android.permission.MANAGE_DEVICE_POLICY_APP_FUNCTIONS"; field public static final String MANAGE_DEVICE_POLICY_APP_RESTRICTIONS = "android.permission.MANAGE_DEVICE_POLICY_APP_RESTRICTIONS"; field public static final String MANAGE_DEVICE_POLICY_APP_USER_DATA = "android.permission.MANAGE_DEVICE_POLICY_APP_USER_DATA"; field public static final String MANAGE_DEVICE_POLICY_ASSIST_CONTENT = "android.permission.MANAGE_DEVICE_POLICY_ASSIST_CONTENT"; @@ -247,6 +248,7 @@ package android { field public static final String READ_BASIC_PHONE_STATE = "android.permission.READ_BASIC_PHONE_STATE"; field public static final String READ_CALENDAR = "android.permission.READ_CALENDAR"; field public static final String READ_CALL_LOG = "android.permission.READ_CALL_LOG"; + field @FlaggedApi("android.media.tv.flags.media_quality_fw") public static final String READ_COLOR_ZONES = "android.permission.READ_COLOR_ZONES"; field public static final String READ_CONTACTS = "android.permission.READ_CONTACTS"; field @FlaggedApi("com.android.server.feature.flags.enable_read_dropbox_permission") public static final String READ_DROPBOX_DATA = "android.permission.READ_DROPBOX_DATA"; field public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE"; @@ -8073,6 +8075,7 @@ package android.app.admin { field public static final String ACCOUNT_MANAGEMENT_DISABLED_POLICY = "accountManagementDisabled"; field public static final String APPLICATION_HIDDEN_POLICY = "applicationHidden"; field public static final String APPLICATION_RESTRICTIONS_POLICY = "applicationRestrictions"; + field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String APP_FUNCTIONS_POLICY = "appFunctions"; field public static final String AUTO_TIMEZONE_POLICY = "autoTimezone"; field public static final String AUTO_TIME_POLICY = "autoTime"; field public static final String BACKUP_SERVICE_POLICY = "backupService"; @@ -8122,6 +8125,7 @@ package android.app.admin { method @NonNull public java.util.Set<java.lang.String> getAffiliationIds(@NonNull android.content.ComponentName); method @Nullable public java.util.Set<java.lang.String> getAlwaysOnVpnLockdownWhitelist(@NonNull android.content.ComponentName); method @Nullable public String getAlwaysOnVpnPackage(@NonNull android.content.ComponentName); + method @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_APP_FUNCTIONS, conditional=true) public int getAppFunctionsPolicy(); method @NonNull @WorkerThread public android.os.Bundle getApplicationRestrictions(@Nullable android.content.ComponentName, String); method @Deprecated @Nullable public String getApplicationRestrictionsManagingPackage(@NonNull android.content.ComponentName); method @RequiresPermission(anyOf={android.Manifest.permission.SET_TIME, "android.permission.QUERY_ADMIN_POLICY"}, conditional=true) public boolean getAutoTimeEnabled(@Nullable android.content.ComponentName); @@ -8280,6 +8284,7 @@ package android.app.admin { method public void setAffiliationIds(@NonNull android.content.ComponentName, @NonNull java.util.Set<java.lang.String>); method public void setAlwaysOnVpnPackage(@NonNull android.content.ComponentName, @Nullable String, boolean) throws android.content.pm.PackageManager.NameNotFoundException; method public void setAlwaysOnVpnPackage(@NonNull android.content.ComponentName, @Nullable String, boolean, @Nullable java.util.Set<java.lang.String>) throws android.content.pm.PackageManager.NameNotFoundException; + method @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_APP_FUNCTIONS, conditional=true) public void setAppFunctionsPolicy(int); method @RequiresPermission(value=android.Manifest.permission.MANAGE_DEVICE_POLICY_PACKAGE_STATE, conditional=true) public boolean setApplicationHidden(@Nullable android.content.ComponentName, String, boolean); method @WorkerThread public void setApplicationRestrictions(@Nullable android.content.ComponentName, String, android.os.Bundle); method @Deprecated public void setApplicationRestrictionsManagingPackage(@NonNull android.content.ComponentName, @Nullable String) throws android.content.pm.PackageManager.NameNotFoundException; @@ -8406,6 +8411,9 @@ package android.app.admin { field public static final String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD"; field public static final String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION"; field public static final String ACTION_SYSTEM_UPDATE_POLICY_CHANGED = "android.app.action.SYSTEM_UPDATE_POLICY_CHANGED"; + field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final int APP_FUNCTIONS_DISABLED = 1; // 0x1 + field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final int APP_FUNCTIONS_DISABLED_CROSS_PROFILE = 2; // 0x2 + field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final int APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY = 0; // 0x0 field @FlaggedApi("android.app.admin.flags.set_auto_time_enabled_coexistence") public static final int AUTO_TIME_DISABLED = 1; // 0x1 field @FlaggedApi("android.app.admin.flags.set_auto_time_enabled_coexistence") public static final int AUTO_TIME_ENABLED = 2; // 0x2 field @FlaggedApi("android.app.admin.flags.set_auto_time_enabled_coexistence") public static final int AUTO_TIME_NOT_CONTROLLED_BY_POLICY = 0; // 0x0 @@ -17082,7 +17090,7 @@ package android.graphics { method public void arcTo(@NonNull android.graphics.RectF, float, float); method public void arcTo(float, float, float, float, float, float, boolean); method public void close(); - method @Deprecated public void computeBounds(@NonNull android.graphics.RectF, boolean); + method public void computeBounds(@NonNull android.graphics.RectF, boolean); method @FlaggedApi("com.android.graphics.flags.exact_compute_bounds") public void computeBounds(@NonNull android.graphics.RectF); method public void conicTo(float, float, float, float, float); method public void cubicTo(float, float, float, float, float, float); @@ -20809,6 +20817,7 @@ package android.hardware.display { method public int describeContents(); method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @FloatRange(from=0.0f, to=1.0f) public float getDefaultBrightness(); method public int getDensityDpi(); + method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @FloatRange(from=0.0f, to=1.0f) public float getDimBrightness(); method @NonNull public java.util.Set<java.lang.String> getDisplayCategories(); method public int getFlags(); method public int getHeight(); @@ -20830,6 +20839,7 @@ package android.hardware.display { method @NonNull public android.hardware.display.VirtualDisplayConfig build(); method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setBrightnessListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.display.VirtualDisplayConfig.BrightnessListener); method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDefaultBrightness(@FloatRange(from=0.0f, to=1.0f) float); + method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDimBrightness(@FloatRange(from=0.0f, to=1.0f) float); method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setDisplayCategories(@NonNull java.util.Set<java.lang.String>); method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setFlags(int); method @NonNull public android.hardware.display.VirtualDisplayConfig.Builder setRequestedRefreshRate(@FloatRange(from=0.0f) float); @@ -21778,6 +21788,18 @@ package android.media { field public static final int ENCODING_DTS_UHD_P2 = 30; // 0x1e field public static final int ENCODING_E_AC3 = 6; // 0x6 field public static final int ENCODING_E_AC3_JOC = 18; // 0x12 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC = 42; // 0x2a + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC = 43; // 0x2b + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS = 41; // 0x29 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM = 44; // 0x2c + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_BASE_PROFILE_AAC = 38; // 0x26 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_BASE_PROFILE_FLAC = 39; // 0x27 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_BASE_PROFILE_OPUS = 37; // 0x25 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_BASE_PROFILE_PCM = 40; // 0x28 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_SIMPLE_PROFILE_AAC = 34; // 0x22 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_SIMPLE_PROFILE_FLAC = 35; // 0x23 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_SIMPLE_PROFILE_OPUS = 33; // 0x21 + field @FlaggedApi("android.media.audio.iamf_definitions_api") public static final int ENCODING_IAMF_SIMPLE_PROFILE_PCM = 36; // 0x24 field public static final int ENCODING_IEC61937 = 13; // 0xd field public static final int ENCODING_INVALID = 0; // 0x0 field public static final int ENCODING_MP3 = 9; // 0x9 @@ -27158,10 +27180,10 @@ package android.media.quality { method public int describeContents(); method public int getColorFormat(); method public int getCompressAlgorithm(); - method @IntRange(from=0) public int getHorizontalZonesNumber(); + method @IntRange(from=0, to=128) public int getHorizontalZonesNumber(); method @NonNull public String getPackageName(); method public int getSource(); - method @IntRange(from=0) public int getVerticalZonesNumber(); + method @IntRange(from=0, to=80) public int getVerticalZonesNumber(); method @NonNull public int[] getZonesColors(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.media.quality.AmbientBacklightMetadata> CREATOR; @@ -40751,8 +40773,10 @@ package android.security.keystore { method @NonNull public java.util.List<java.security.cert.X509Certificate> getGrantedCertificateChainFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException; method @NonNull public java.security.Key getGrantedKeyFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException; method @NonNull public java.security.KeyPair getGrantedKeyPairFromId(long) throws android.security.keystore.KeyPermanentlyInvalidatedException, java.security.UnrecoverableKeyException; + method @FlaggedApi("android.security.keystore2.attest_modules") @NonNull public byte[] getSupplementaryAttestationInfo(int) throws android.security.KeyStoreException; method public long grantKeyAccess(@NonNull String, int) throws android.security.KeyStoreException, java.security.UnrecoverableKeyException; method public void revokeKeyAccess(@NonNull String, int) throws android.security.KeyStoreException, java.security.UnrecoverableKeyException; + field public static final int MODULE_HASH = -1879047468; // 0x900002d4 } public class SecureKeyImportUnavailableException extends java.security.ProviderException { @@ -40808,13 +40832,14 @@ package android.service.autofill { public abstract class AutofillService extends android.app.Service { ctor public AutofillService(); - method @Nullable public final android.service.autofill.FillEventHistory getFillEventHistory(); + method @Deprecated @FlaggedApi("android.service.autofill.autofill_session_destroyed") @Nullable public final android.service.autofill.FillEventHistory getFillEventHistory(); method public final android.os.IBinder onBind(android.content.Intent); method public void onConnected(); method public void onDisconnected(); method public abstract void onFillRequest(@NonNull android.service.autofill.FillRequest, @NonNull android.os.CancellationSignal, @NonNull android.service.autofill.FillCallback); method public abstract void onSaveRequest(@NonNull android.service.autofill.SaveRequest, @NonNull android.service.autofill.SaveCallback); method public void onSavedDatasetsInfoRequest(@NonNull android.service.autofill.SavedDatasetsInfoCallback); + method @FlaggedApi("android.service.autofill.autofill_session_destroyed") public void onSessionDestroyed(@Nullable android.service.autofill.FillEventHistory); field public static final String EXTRA_FILL_RESPONSE = "android.service.autofill.extra.FILL_RESPONSE"; field public static final String SERVICE_INTERFACE = "android.service.autofill.AutofillService"; field public static final String SERVICE_META_DATA = "android.autofill"; @@ -42544,9 +42569,10 @@ package android.service.settings.preferences { method public boolean isWritable(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.service.settings.preferences.SettingsPreferenceMetadata> CREATOR; - field public static final int INTENT_ONLY = 2; // 0x2 - field public static final int NOT_SENSITIVE = 0; // 0x0 - field public static final int SENSITIVE = 1; // 0x1 + field public static final int EXPECT_POST_CONFIRMATION = 1; // 0x1 + field public static final int EXPECT_PRE_CONFIRMATION = 2; // 0x2 + field public static final int NO_DIRECT_ACCESS = 3; // 0x3 + field public static final int NO_SENSITIVITY = 0; // 0x0 } public static final class SettingsPreferenceMetadata.Builder { @@ -53393,6 +53419,7 @@ package android.view { field @NonNull public static final android.os.Parcelable.Creator<android.view.Surface> CREATOR; field public static final int FRAME_RATE_COMPATIBILITY_DEFAULT = 0; // 0x0 field public static final int FRAME_RATE_COMPATIBILITY_FIXED_SOURCE = 1; // 0x1 + field @FlaggedApi("com.android.graphics.surfaceflinger.flags.arr_setframerate_gte_enum") public static final int FRAME_RATE_COMPATIBILITY_GTE = 2; // 0x2 field public static final int ROTATION_0 = 0; // 0x0 field public static final int ROTATION_180 = 2; // 0x2 field public static final int ROTATION_270 = 3; // 0x3 diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index fe6e9950a175..bca2ce2473c5 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -482,6 +482,10 @@ package android.os { field public static final long TRACE_TAG_NETWORK = 2097152L; // 0x200000L } + public class UpdateEngine { + method @FlaggedApi("android.os.update_engine_api") public void triggerPostinstall(@NonNull String); + } + } package android.os.storage { diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 04aca5454aad..ce62ccf4fbd0 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -78,6 +78,7 @@ package android { field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String BIND_ON_DEVICE_INTELLIGENCE_SERVICE = "android.permission.BIND_ON_DEVICE_INTELLIGENCE_SERVICE"; field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE = "android.permission.BIND_ON_DEVICE_SANDBOXED_INFERENCE_SERVICE"; field public static final String BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE = "android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE"; + field @FlaggedApi("android.location.flags.population_density_provider") public static final String BIND_POPULATION_DENSITY_PROVIDER_SERVICE = "android.permission.BIND_POPULATION_DENSITY_PROVIDER_SERVICE"; field public static final String BIND_PRINT_RECOMMENDATION_SERVICE = "android.permission.BIND_PRINT_RECOMMENDATION_SERVICE"; field public static final String BIND_REMOTE_LOCKSCREEN_VALIDATION_SERVICE = "android.permission.BIND_REMOTE_LOCKSCREEN_VALIDATION_SERVICE"; field public static final String BIND_RESOLVER_RANKER_SERVICE = "android.permission.BIND_RESOLVER_RANKER_SERVICE"; @@ -549,6 +550,7 @@ package android { field public static final int config_systemTextIntelligence = 17039414; // 0x1040036 field public static final int config_systemUi = 17039418; // 0x104003a field public static final int config_systemUiIntelligence = 17039410; // 0x1040032 + field @FlaggedApi("android.permission.flags.system_vendor_intelligence_role_enabled") public static final int config_systemVendorIntelligence; field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037 field public static final int config_systemWearHealthService = 17039428; // 0x1040044 field public static final int config_systemWellbeing = 17039408; // 0x1040030 @@ -1290,6 +1292,7 @@ package android.app { method @FlaggedApi("android.app.live_wallpaper_content_handling") @Nullable @RequiresPermission(android.Manifest.permission.READ_WALLPAPER_INTERNAL) public android.app.wallpaper.WallpaperInstance getWallpaperInstance(int); method public void setDisplayOffset(android.os.IBinder, int, int); method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithCrops(@NonNull java.io.InputStream, @NonNull android.util.SparseArray<android.graphics.Rect>, boolean, int) throws java.io.IOException; + method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithDescription(@NonNull java.io.InputStream, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException; method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponent(android.content.ComponentName); method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(allOf={android.Manifest.permission.SET_WALLPAPER_COMPONENT, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}, conditional=true) public boolean setWallpaperComponentWithDescription(@NonNull android.app.wallpaper.WallpaperDescription, int); method @RequiresPermission(android.Manifest.permission.SET_WALLPAPER_COMPONENT) public boolean setWallpaperComponentWithFlags(@NonNull android.content.ComponentName, int); @@ -3301,6 +3304,14 @@ package android.app.usage { } +package android.app.wallpaper { + + @FlaggedApi("android.app.live_wallpaper_content_handling") public final class WallpaperDescription implements android.os.Parcelable { + method @NonNull public android.util.SparseArray<android.graphics.Rect> getCropHints(); + } + +} + package android.app.wallpapereffectsgeneration { public final class CameraAttributes implements android.os.Parcelable { @@ -5254,9 +5265,9 @@ package android.hardware.contexthub { } @FlaggedApi("android.chre.flags.offload_api") public class HubEndpointSession implements java.lang.AutoCloseable { - method public void close(); + method @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void close(); method @Nullable public android.hardware.contexthub.HubServiceInfo getServiceInfo(); - method @NonNull public android.hardware.location.ContextHubTransaction<java.lang.Void> sendMessage(@NonNull android.hardware.contexthub.HubMessage); + method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public android.hardware.location.ContextHubTransaction<java.lang.Void> sendMessage(@NonNull android.hardware.contexthub.HubMessage); } @FlaggedApi("android.chre.flags.offload_api") public class HubEndpointSessionResult { @@ -8126,6 +8137,8 @@ package android.media.quality { method @NonNull public java.util.List<android.media.quality.SoundProfile> getSoundProfilesByPackage(@NonNull String); method public void setAutoPictureQualityEnabled(boolean); method public void setAutoSoundQualityEnabled(boolean); + method public boolean setDefaultPictureProfile(@Nullable String); + method public boolean setDefaultSoundProfile(@Nullable String); method public void setPictureProfileAllowList(@NonNull java.util.List<java.lang.String>); method public void setSoundProfileAllowList(@NonNull java.util.List<java.lang.String>); method public void setSuperResolutionEnabled(boolean); @@ -12603,6 +12616,7 @@ package android.provider { field public static final String ACTION_REQUEST_ENABLE_CONTENT_CAPTURE = "android.settings.REQUEST_ENABLE_CONTENT_CAPTURE"; field public static final String ACTION_SHOW_ADMIN_SUPPORT_DETAILS = "android.settings.SHOW_ADMIN_SUPPORT_DETAILS"; field public static final String ACTION_SHOW_RESTRICTED_SETTING_DIALOG = "android.settings.SHOW_RESTRICTED_SETTING_DIALOG"; + field @FlaggedApi("com.android.internal.telephony.flags.action_sim_preference_settings") public static final String ACTION_SIM_PREFERENCE_SETTINGS = "android.settings.SIM_PREFERENCE_SETTINGS"; field public static final String ACTION_TETHER_PROVISIONING_UI = "android.settings.TETHER_PROVISIONING_UI"; field public static final String ACTION_TETHER_SETTINGS = "android.settings.TETHER_SETTINGS"; field public static final String ACTION_TETHER_UNSUPPORTED_CARRIER_UI = "android.settings.TETHER_UNSUPPORTED_CARRIER_UI"; @@ -19150,8 +19164,10 @@ package android.view { public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable { method public final long getUserActivityTimeout(); + method @FlaggedApi("com.android.hardware.input.override_power_key_behavior_in_focused_window") @RequiresPermission(android.Manifest.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) public boolean isReceivePowerKeyDoublePressEnabled(); method public boolean isSystemApplicationOverlay(); method @FlaggedApi("android.companion.virtualdevice.flags.status_bar_and_insets") public void setInsetsParams(@NonNull java.util.List<android.view.WindowManager.InsetsParams>); + method @FlaggedApi("com.android.hardware.input.override_power_key_behavior_in_focused_window") @RequiresPermission(android.Manifest.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) public void setReceivePowerKeyDoublePressEnabled(boolean); method @RequiresPermission(android.Manifest.permission.SYSTEM_APPLICATION_OVERLAY) public void setSystemApplicationOverlay(boolean); method public final void setUserActivityTimeout(long); field @RequiresPermission(android.Manifest.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS) public static final int SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS = 524288; // 0x80000 diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 603677e89240..0a806c76a24b 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -543,7 +543,6 @@ package android.app { method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmapWithCrops(@Nullable android.graphics.Bitmap, @NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>, boolean, int) throws java.io.IOException; method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setBitmapWithDescription(@Nullable android.graphics.Bitmap, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException; method @FlaggedApi("com.android.window.flags.multi_crop") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithCrops(@NonNull java.io.InputStream, @NonNull java.util.Map<android.graphics.Point,android.graphics.Rect>, boolean, int) throws java.io.IOException; - method @FlaggedApi("android.app.live_wallpaper_content_handling") @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithDescription(@NonNull java.io.InputStream, @NonNull android.app.wallpaper.WallpaperDescription, boolean, int) throws java.io.IOException; method public void setWallpaperZoomOut(@NonNull android.os.IBinder, float); method public boolean shouldEnableWideColorGamut(); method public boolean wallpaperSupportsWcg(int); @@ -658,6 +657,7 @@ package android.app.admin { field public static final int OPERATION_SET_ALWAYS_ON_VPN_PACKAGE = 30; // 0x1e field public static final int OPERATION_SET_APPLICATION_HIDDEN = 15; // 0xf field public static final int OPERATION_SET_APPLICATION_RESTRICTIONS = 16; // 0x10 + field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final int OPERATION_SET_APP_FUNCTIONS_POLICY = 42; // 0x2a field public static final int OPERATION_SET_CAMERA_DISABLED = 31; // 0x1f field @FlaggedApi("android.view.contentprotection.flags.manage_device_policy_enabled") public static final int OPERATION_SET_CONTENT_PROTECTION_POLICY = 41; // 0x29 field public static final int OPERATION_SET_FACTORY_RESET_PROTECTION_POLICY = 32; // 0x20 diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 33ba05865042..69d3e8d4c0d2 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -1189,6 +1189,18 @@ public class ActivityManager { return procState == PROCESS_STATE_FOREGROUND_SERVICE; } + /** @hide Should this process state be considered jank perceptible? */ + public static final boolean isProcStateJankPerceptible(int procState) { + if (Flags.jankPerceptibleNarrow()) { + return procState == PROCESS_STATE_PERSISTENT_UI + || procState == PROCESS_STATE_TOP + || procState == PROCESS_STATE_IMPORTANT_FOREGROUND + || procState == PROCESS_STATE_TOP_SLEEPING; + } else { + return !isProcStateCached(procState); + } + } + /** @hide requestType for assist context: only basic information. */ public static final int ASSIST_CONTEXT_BASIC = 0; diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 3c1cce973b3a..3cc5ff03a2a3 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1372,7 +1372,8 @@ public final class ActivityThread extends ClientTransactionHandler data.startRequestedElapsedTime = startRequestedElapsedTime; data.startRequestedUptime = startRequestedUptime; updateCompatOverrideScale(compatInfo); - CompatibilityInfo.applyOverrideScaleIfNeeded(config); + updateCompatOverrideDisplayRotation(compatInfo); + CompatibilityInfo.applyOverrideIfNeeded(config); sendMessage(H.BIND_APPLICATION, data); } @@ -1386,6 +1387,15 @@ public final class ActivityThread extends ClientTransactionHandler } } + private void updateCompatOverrideDisplayRotation(@NonNull CompatibilityInfo info) { + if (info.isOverrideDisplayRotationRequired()) { + CompatibilityInfo.setOverrideDisplayRotation(info.applicationDisplayRotation); + } else { + CompatibilityInfo.setOverrideDisplayRotation( + WindowConfiguration.ROTATION_UNDEFINED); + } + } + public final void runIsolatedEntryPoint(String entryPoint, String[] entryPointArgs) { SomeArgs args = SomeArgs.obtain(); args.arg1 = entryPoint; @@ -2036,6 +2046,7 @@ public final class ActivityThread extends ClientTransactionHandler ucd.pkg = pkg; ucd.info = info; updateCompatOverrideScale(info); + updateCompatOverrideDisplayRotation(info); sendMessage(H.UPDATE_PACKAGE_COMPATIBILITY_INFO, ucd); } @@ -3907,12 +3918,7 @@ public final class ActivityThread extends ClientTransactionHandler if (mLastProcessState == processState) { return; } - // Do not issue a transitional GC if we are transitioning between 2 cached states. - // Only update if the state flips between cached and uncached or vice versa - if (ActivityManager.isProcStateCached(mLastProcessState) - != ActivityManager.isProcStateCached(processState)) { - updateVmProcessState(processState); - } + updateVmProcessState(mLastProcessState, processState); mLastProcessState = processState; if (localLOGV) { Slog.i(TAG, "******************* PROCESS STATE CHANGED TO: " + processState @@ -3921,18 +3927,21 @@ public final class ActivityThread extends ClientTransactionHandler } } + /** Converts a process state to a VM process state. */ + private static int toVmProcessState(int processState) { + final int state = ActivityManager.isProcStateJankPerceptible(processState) + ? VM_PROCESS_STATE_JANK_PERCEPTIBLE + : VM_PROCESS_STATE_JANK_IMPERCEPTIBLE; + return state; + } + /** Update VM state based on ActivityManager.PROCESS_STATE_* constants. */ - // Currently ART VM only uses state updates for Transitional GC, and thus - // this function initiates a Transitional GC for transitions into Cached apps states. - private void updateVmProcessState(int processState) { - // Only a transition into Cached state should result in a Transitional GC request - // to the ART runtime. Update VM state to JANK_IMPERCEPTIBLE in that case. - // Note that there are 4 possible cached states currently, all of which are - // JANK_IMPERCEPTIBLE from GC point of view. - final int state = ActivityManager.isProcStateCached(processState) - ? VM_PROCESS_STATE_JANK_IMPERCEPTIBLE - : VM_PROCESS_STATE_JANK_PERCEPTIBLE; - VMRuntime.getRuntime().updateProcessState(state); + private void updateVmProcessState(int lastProcessState, int newProcessState) { + final int state = toVmProcessState(newProcessState); + if (lastProcessState == PROCESS_STATE_UNKNOWN + || state != toVmProcessState(lastProcessState)) { + VMRuntime.getRuntime().updateProcessState(state); + } } @Override @@ -5159,7 +5168,7 @@ public final class ActivityThread extends ClientTransactionHandler try { if (doRebind) { ActivityManager.getService().unbindFinished( - data.token, data.intent, doRebind); + data.token, data.intent); } else { ActivityManager.getService().serviceDoneExecuting( data.token, SERVICE_DONE_EXECUTING_UNBIND, 0, 0, data.intent); diff --git a/core/java/android/app/AppOpsManager.aidl b/core/java/android/app/AppOpsManager.aidl index b4dee2e937cb..56ed290baf2e 100644 --- a/core/java/android/app/AppOpsManager.aidl +++ b/core/java/android/app/AppOpsManager.aidl @@ -19,6 +19,7 @@ package android.app; parcelable AppOpsManager.PackageOps; parcelable AppOpsManager.NoteOpEventProxyInfo; parcelable AppOpsManager.NoteOpEvent; +parcelable AppOpsManager.NotedOp; parcelable AppOpsManager.OpFeatureEntry; parcelable AppOpsManager.OpEntry; diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index 19138126698c..c789e28cdbab 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -262,6 +262,24 @@ public class AppOpsManager { private static final Object sLock = new Object(); + // A map that records noted times for each op. + private final ArrayMap<NotedOp, Integer> mPendingNotedOps = new ArrayMap<>(); + private final HandlerThread mHandlerThread; + private final Handler mHandler; + private static final int NOTE_OP_BATCHING_DELAY_MILLIS = 1000; + + private boolean isNoteOpBatchingSupported() { + // If noteOp is called from system server no IPC is made, hence we don't need batching. + if (Process.myUid() == Process.SYSTEM_UID) { + return false; + } + return Flags.noteOpBatchingEnabled(); + } + + private final Object mBatchedNoteOpLock = new Object(); + @GuardedBy("mBatchedNoteOpLock") + private boolean mIsBatchedNoteOpCallScheduled = false; + /** Current {@link OnOpNotedCallback}. Change via {@link #setOnOpNotedCallback} */ @GuardedBy("sLock") private static @Nullable OnOpNotedCallback sOnOpNotedCallback; @@ -7466,6 +7484,135 @@ public class AppOpsManager { } /** + * A NotedOp is an app op grouped in noteOp API and sent to the system server in a batch + * + * @hide + */ + public static final class NotedOp implements Parcelable { + private final @IntRange(from = 0, to = _NUM_OP - 1) int mOp; + private final @IntRange(from = 0) int mUid; + private final @Nullable String mPackageName; + private final @Nullable String mAttributionTag; + private final int mVirtualDeviceId; + private final @Nullable String mMessage; + private final boolean mShouldCollectAsyncNotedOp; + private final boolean mShouldCollectMessage; + + public NotedOp(int op, int uid, @Nullable String packageName, + @Nullable String attributionTag, int virtualDeviceId, @Nullable String message, + boolean shouldCollectAsyncNotedOp, boolean shouldCollectMessage) { + mOp = op; + mUid = uid; + mPackageName = packageName; + mAttributionTag = attributionTag; + mVirtualDeviceId = virtualDeviceId; + mMessage = message; + mShouldCollectAsyncNotedOp = shouldCollectAsyncNotedOp; + mShouldCollectMessage = shouldCollectMessage; + } + + NotedOp(Parcel source) { + mOp = source.readInt(); + mUid = source.readInt(); + mPackageName = source.readString(); + mAttributionTag = source.readString(); + mVirtualDeviceId = source.readInt(); + mMessage = source.readString(); + mShouldCollectAsyncNotedOp = source.readBoolean(); + mShouldCollectMessage = source.readBoolean(); + } + + public int getOp() { + return mOp; + } + + public int getUid() { + return mUid; + } + + public @Nullable String getPackageName() { + return mPackageName; + } + + public @Nullable String getAttributionTag() { + return mAttributionTag; + } + + public int getVirtualDeviceId() { + return mVirtualDeviceId; + } + + public @Nullable String getMessage() { + return mMessage; + } + + public boolean getShouldCollectAsyncNotedOp() { + return mShouldCollectAsyncNotedOp; + } + + public boolean getShouldCollectMessage() { + return mShouldCollectMessage; + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeInt(mOp); + dest.writeInt(mUid); + dest.writeString(mPackageName); + dest.writeString(mAttributionTag); + dest.writeInt(mVirtualDeviceId); + dest.writeString(mMessage); + dest.writeBoolean(mShouldCollectAsyncNotedOp); + dest.writeBoolean(mShouldCollectMessage); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + NotedOp that = (NotedOp) o; + return mOp == that.mOp && mUid == that.mUid && Objects.equals(mPackageName, + that.mPackageName) && Objects.equals(mAttributionTag, that.mAttributionTag) + && mVirtualDeviceId == that.mVirtualDeviceId && Objects.equals(mMessage, + that.mMessage) && Objects.equals(mShouldCollectAsyncNotedOp, + that.mShouldCollectAsyncNotedOp) && Objects.equals(mShouldCollectMessage, + that.mShouldCollectMessage); + } + + @Override + public int hashCode() { + return Objects.hash(mOp, mUid, mPackageName, mAttributionTag, mVirtualDeviceId, + mMessage, mShouldCollectAsyncNotedOp, mShouldCollectMessage); + } + + @Override + public String toString() { + return "NotedOp{" + "mOp=" + mOp + ", mUid=" + mUid + ", mPackageName=" + mPackageName + + ", mAttributionTag=" + mAttributionTag + ", mVirtualDeviceId=" + + mVirtualDeviceId + ", mMessage=" + mMessage + ", mShouldCollectAsyncNotedOp=" + + mShouldCollectAsyncNotedOp + ", mShouldCollectMessage=" + + mShouldCollectMessage + "}"; + } + + + public static final @NonNull Creator<NotedOp> CREATOR = + new Creator<>() { + @Override public NotedOp createFromParcel(Parcel source) { + return new NotedOp(source); + } + + @Override public NotedOp[] newArray(int size) { + return new NotedOp[size]; + } + }; + } + + /** * Computes the sum of the counts for the given flags in between the begin and * end UID states. * @@ -7979,6 +8126,9 @@ public class AppOpsManager { AppOpsManager(Context context, IAppOpsService service) { mContext = context; mService = service; + mHandlerThread = new HandlerThread("AppOpsManager"); + mHandlerThread.start(); + mHandler = mHandlerThread.getThreadHandler(); if (mContext != null) { final PackageManager pm = mContext.getPackageManager(); @@ -9315,15 +9465,74 @@ public class AppOpsManager { } } - SyncNotedAppOp syncOp; - if (virtualDeviceId == Context.DEVICE_ID_DEFAULT) { - syncOp = mService.noteOperation(op, uid, packageName, attributionTag, - collectionMode == COLLECT_ASYNC, message, shouldCollectMessage); - } else { - syncOp = mService.noteOperationForDevice(op, uid, packageName, attributionTag, - virtualDeviceId, collectionMode == COLLECT_ASYNC, message, - shouldCollectMessage); + SyncNotedAppOp syncOp = null; + boolean skipBinderCall = false; + if (isNoteOpBatchingSupported()) { + int mode = sAppOpModeCache.query( + new AppOpModeQuery(op, uid, packageName, virtualDeviceId, attributionTag, + "noteOpNoThrow")); + // For FOREGROUND mode, we still need to make a binder call to the system service + // to translate it to ALLOWED or IGNORED. So no batching is needed. + if (mode != MODE_FOREGROUND) { + synchronized (mBatchedNoteOpLock) { + NotedOp notedOp = new NotedOp(op, uid, packageName, attributionTag, + virtualDeviceId, message, collectionMode == COLLECT_ASYNC, + shouldCollectMessage); + + // Batch same noteOp calls and send them with their counters to the system + // service asynchronously. The time window for batching is specified in + // NOTE_OP_BATCHING_DELAY_MILLIS. Always allow the first noteOp call to go + // through binder API. Accumulate subsequent same noteOp calls during the + // time window in mPendingNotedOps. + if (!mPendingNotedOps.containsKey(notedOp)) { + mPendingNotedOps.put(notedOp, 0); + } else { + skipBinderCall = true; + mPendingNotedOps.merge(notedOp, 1, Integer::sum); + } + + if (!mIsBatchedNoteOpCallScheduled) { + mHandler.postDelayed(() -> { + ArrayMap<NotedOp, Integer> pendingNotedOpsCopy; + synchronized(mBatchedNoteOpLock) { + mIsBatchedNoteOpCallScheduled = false; + pendingNotedOpsCopy = + new ArrayMap<NotedOp, Integer>(mPendingNotedOps); + mPendingNotedOps.clear(); + } + for (int i = pendingNotedOpsCopy.size() - 1; i >= 0; i--) { + if (pendingNotedOpsCopy.valueAt(i) == 0) { + pendingNotedOpsCopy.removeAt(i); + } + } + if (!pendingNotedOpsCopy.isEmpty()) { + try { + mService.noteOperationsInBatch(pendingNotedOpsCopy); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + }, NOTE_OP_BATCHING_DELAY_MILLIS); + + mIsBatchedNoteOpCallScheduled = true; + } + } + + syncOp = new SyncNotedAppOp(mode, op, attributionTag, packageName); + } + } + + if (!skipBinderCall) { + if (virtualDeviceId == Context.DEVICE_ID_DEFAULT) { + syncOp = mService.noteOperation(op, uid, packageName, attributionTag, + collectionMode == COLLECT_ASYNC, message, shouldCollectMessage); + } else { + syncOp = mService.noteOperationForDevice(op, uid, packageName, attributionTag, + virtualDeviceId, collectionMode == COLLECT_ASYNC, message, + shouldCollectMessage); + } } + if (syncOp.getOpMode() == MODE_ALLOWED) { if (collectionMode == COLLECT_SELF) { collectNotedOpForSelf(syncOp); diff --git a/core/java/android/app/AppOpsManagerInternal.java b/core/java/android/app/AppOpsManagerInternal.java index b21defbcc0e3..8b7ea0f8b46a 100644 --- a/core/java/android/app/AppOpsManagerInternal.java +++ b/core/java/android/app/AppOpsManagerInternal.java @@ -29,7 +29,7 @@ import com.android.internal.app.IAppOpsCallback; import com.android.internal.util.function.DodecFunction; import com.android.internal.util.function.HexConsumer; import com.android.internal.util.function.HexFunction; -import com.android.internal.util.function.OctFunction; +import com.android.internal.util.function.NonaFunction; import com.android.internal.util.function.QuadFunction; import com.android.internal.util.function.UndecFunction; @@ -86,9 +86,9 @@ public abstract class AppOpsManagerInternal { */ SyncNotedAppOp noteOperation(int code, int uid, @Nullable String packageName, @Nullable String featureId, int virtualDeviceId, boolean shouldCollectAsyncNotedOp, - @Nullable String message, boolean shouldCollectMessage, - @NonNull OctFunction<Integer, Integer, String, String, Integer, Boolean, String, - Boolean, SyncNotedAppOp> superImpl); + @Nullable String message, boolean shouldCollectMessage, int notedCount, + @NonNull NonaFunction<Integer, Integer, String, String, Integer, Boolean, String, + Boolean, Integer, SyncNotedAppOp> superImpl); /** * Allows overriding note proxy operation behavior. diff --git a/core/java/android/app/CameraCompatTaskInfo.java b/core/java/android/app/CameraCompatTaskInfo.java index 432a0da15a47..845d2acbaf9d 100644 --- a/core/java/android/app/CameraCompatTaskInfo.java +++ b/core/java/android/app/CameraCompatTaskInfo.java @@ -16,11 +16,16 @@ package android.app; +import static android.app.WindowConfiguration.ROTATION_UNDEFINED; +import static android.view.Surface.ROTATION_0; +import static android.view.Surface.ROTATION_90; + import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.os.Parcel; import android.os.Parcelable; +import android.view.Surface; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -153,6 +158,27 @@ public class CameraCompatTaskInfo implements Parcelable { + "}"; } + /** + * Returns the sandboxed display rotation based on the given {@code cameraCompatMode}. + * + * <p>This will be what the app likely expects in its requested orientation while running on a + * device with portrait natural orientation: `CAMERA_COMPAT_FREEFORM_PORTRAIT_*` is 0, and + * `CAMERA_COMPAT_FREEFORM_LANDSCAPE_*` is 90. + * + * @return {@link WindowConfiguration#ROTATION_UNDEFINED} if not in camera compat mode. + */ + @Surface.Rotation + public static int getDisplayRotationFromCameraCompatMode(@FreeformCameraCompatMode int + cameraCompatMode) { + return switch (cameraCompatMode) { + case CAMERA_COMPAT_FREEFORM_PORTRAIT_DEVICE_IN_LANDSCAPE, + CAMERA_COMPAT_FREEFORM_PORTRAIT_DEVICE_IN_PORTRAIT -> ROTATION_0; + case CAMERA_COMPAT_FREEFORM_LANDSCAPE_DEVICE_IN_LANDSCAPE, + CAMERA_COMPAT_FREEFORM_LANDSCAPE_DEVICE_IN_PORTRAIT -> ROTATION_90; + default -> ROTATION_UNDEFINED; + }; + } + /** Human readable version of the freeform camera compat mode. */ @NonNull public static String freeformCameraCompatModeToString( diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index 50486611a5a9..ad01ad57b2d8 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -321,7 +321,7 @@ interface IActivityManager { oneway void removeContentProvider(in IBinder connection, boolean stable); @UnsupportedAppUsage void setRequestedOrientation(in IBinder token, int requestedOrientation); - void unbindFinished(in IBinder token, in Intent service, boolean doRebind); + void unbindFinished(in IBinder token, in Intent service); @UnsupportedAppUsage void setProcessImportant(in IBinder token, int pid, boolean isForeground, String reason); void setServiceForeground(in ComponentName className, in IBinder token, diff --git a/core/java/android/app/PropertyInvalidatedCache.java b/core/java/android/app/PropertyInvalidatedCache.java index 3973c58c0708..9bb0ba4cf8fa 100644 --- a/core/java/android/app/PropertyInvalidatedCache.java +++ b/core/java/android/app/PropertyInvalidatedCache.java @@ -80,6 +80,17 @@ import java.util.concurrent.atomic.AtomicLong; @android.ravenwood.annotation.RavenwoodKeepWholeClass public class PropertyInvalidatedCache<Query, Result> { /** + * A method to report if the PermissionManager notifications can be separated from cache + * invalidation. The feature relies on a series of flags; the dependency is captured in this + * method. + * @hide + */ + public static boolean separatePermissionNotificationsEnabled() { + return isSharedMemoryAvailable() + && Flags.picSeparatePermissionNotifications(); + } + + /** * This is a configuration class that customizes a cache instance. * @hide */ @@ -1921,6 +1932,10 @@ public class PropertyInvalidatedCache<Query, Result> { } public AutoCorker(@NonNull String propertyName, int autoCorkDelayMs) { + if (separatePermissionNotificationsEnabled()) { + throw new IllegalStateException("AutoCorking is unavailable"); + } + mPropertyName = propertyName; mAutoCorkDelayMs = autoCorkDelayMs; // We can't initialize mHandler here: when we're created, the main loop might not diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index 3cffca796680..51d0b18467f4 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -1517,10 +1517,8 @@ public class ResourcesManager { int changes = mResConfiguration.updateFrom(config); if (compat != null && (mResCompatibilityInfo == null || !mResCompatibilityInfo.equals(compat))) { + changes |= compat.getCompatibilityChangesForConfig(mResCompatibilityInfo); mResCompatibilityInfo = compat; - changes |= ActivityInfo.CONFIG_SCREEN_LAYOUT - | ActivityInfo.CONFIG_SCREEN_SIZE - | ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE; } // If a application info update was scheduled to occur in this process but has not diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 2bd2d34d54a2..f357836e9471 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -82,8 +82,6 @@ import android.content.ContentCaptureOptions; import android.content.Context; import android.content.IRestrictionsManager; import android.content.RestrictionsManager; -import android.content.integrity.AppIntegrityManager; -import android.content.integrity.IAppIntegrityManager; import android.content.om.IOverlayManager; import android.content.om.OverlayManager; import android.content.pm.ApplicationInfo; @@ -1581,16 +1579,6 @@ public final class SystemServiceRegistry { return new AttestationVerificationManager(ctx.getOuterContext(), IAttestationVerificationManagerService.Stub.asInterface(b)); }}); - - //CHECKSTYLE:ON IndentationCheck - registerService(Context.APP_INTEGRITY_SERVICE, AppIntegrityManager.class, - new CachedServiceFetcher<AppIntegrityManager>() { - @Override - public AppIntegrityManager createService(ContextImpl ctx) - throws ServiceNotFoundException { - IBinder b = ServiceManager.getServiceOrThrow(Context.APP_INTEGRITY_SERVICE); - return new AppIntegrityManager(IAppIntegrityManager.Stub.asInterface(b)); - }}); registerService(Context.APP_HIBERNATION_SERVICE, AppHibernationManager.class, new CachedServiceFetcher<AppHibernationManager>() { @Override diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index a8671cf74619..89e25e7d1b4f 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -2092,7 +2092,7 @@ public class WallpaperManager { /** * Returns the description of the designated wallpaper. Returns null if the lock screen - * wallpaper is requested lock screen wallpaper is not set. + * wallpaper is requested and lock screen wallpaper is not set. * @param which Specifies wallpaper to request (home or lock). * @throws IllegalArgumentException if {@code which} is not exactly one of @@ -2733,7 +2733,7 @@ public class WallpaperManager { * @hide */ @FlaggedApi(FLAG_LIVE_WALLPAPER_CONTENT_HANDLING) - @TestApi + @SystemApi @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) public int setStreamWithDescription(@NonNull InputStream bitmapData, @NonNull WallpaperDescription description, boolean allowBackup, diff --git a/core/java/android/app/activity_manager.aconfig b/core/java/android/app/activity_manager.aconfig index 44940aee6a49..21ec585610ce 100644 --- a/core/java/android/app/activity_manager.aconfig +++ b/core/java/android/app/activity_manager.aconfig @@ -166,3 +166,10 @@ flag { bug: "362537357" is_exported: true } + +flag { + name: "jank_perceptible_narrow" + namespace: "system_performance" + description: "Narrow the scope of Jank Perceptible" + bug: "304837972" +} diff --git a/core/java/android/app/admin/DevicePolicyIdentifiers.java b/core/java/android/app/admin/DevicePolicyIdentifiers.java index 35149b5a3135..89261a4f85ee 100644 --- a/core/java/android/app/admin/DevicePolicyIdentifiers.java +++ b/core/java/android/app/admin/DevicePolicyIdentifiers.java @@ -20,6 +20,7 @@ import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.SystemApi; import android.annotation.TestApi; +import android.app.appfunctions.flags.Flags; import android.os.UserManager; import java.util.Objects; @@ -181,6 +182,12 @@ public final class DevicePolicyIdentifiers { public static final String CONTENT_PROTECTION_POLICY = "contentProtection"; /** + * String identifier for {@link DevicePolicyManager#setAppFunctionsPolicy(int)}. + */ + @FlaggedApi(Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + public static final String APP_FUNCTIONS_POLICY = "appFunctions"; + + /** * String identifier for {@link DevicePolicyManager#setUsbDataSignalingEnabled}. */ public static final String USB_DATA_SIGNALING_POLICY = "usbDataSignaling"; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8372078b46a5..9ddc729850c4 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -23,6 +23,7 @@ import static android.Manifest.permission.LOCK_DEVICE; import static android.Manifest.permission.MANAGE_DEVICE_ADMINS; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL; +import static android.Manifest.permission.MANAGE_DEVICE_POLICY_APP_FUNCTIONS; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_CAMERA; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_CERTIFICATES; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_COMMON_CRITERIA_MODE; @@ -3931,6 +3932,11 @@ public class DevicePolicyManager { @FlaggedApi(android.view.contentprotection.flags.Flags.FLAG_MANAGE_DEVICE_POLICY_ENABLED) public static final int OPERATION_SET_CONTENT_PROTECTION_POLICY = 41; + /** @hide */ + @TestApi + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + public static final int OPERATION_SET_APP_FUNCTIONS_POLICY = 42; + private static final String PREFIX_OPERATION = "OPERATION_"; /** @hide */ @@ -3975,7 +3981,8 @@ public class DevicePolicyManager { OPERATION_SET_PERMISSION_POLICY, OPERATION_SET_RESTRICTIONS_PROVIDER, OPERATION_UNINSTALL_CA_CERT, - OPERATION_SET_CONTENT_PROTECTION_POLICY + OPERATION_SET_CONTENT_PROTECTION_POLICY, + OPERATION_SET_APP_FUNCTIONS_POLICY }) @Retention(RetentionPolicy.SOURCE) public static @interface DevicePolicyOperation { @@ -4347,6 +4354,90 @@ public class DevicePolicyManager { } /** + * Indicates that app functions are not controlled by policy. + * + * <p>If no admin set this policy, it means appfunctions are enabled. + */ + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + public static final int APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY = 0; + + /** Indicates that app functions are controlled and disabled by a policy. */ + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + public static final int APP_FUNCTIONS_DISABLED = 1; + + /** + * Indicates that app functions are controlled and disabled by a policy for cross profile + * interactions only. + * + * <p>This is different from {@link #APP_FUNCTIONS_DISABLED} in that it only disables cross + * profile interactions (even if the caller has permissions required to interact across users). + * appfunctions can still be used within the a user profile boundary. + */ + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + public static final int APP_FUNCTIONS_DISABLED_CROSS_PROFILE = 2; + + /** @hide */ + @IntDef( + prefix = {"APP_FUNCTIONS_"}, + value = { + APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY, + APP_FUNCTIONS_DISABLED, + APP_FUNCTIONS_DISABLED_CROSS_PROFILE + }) + @Retention(RetentionPolicy.SOURCE) + public @interface AppFunctionsPolicy {} + + /** + * Sets the app functions policy which controls app functions operations on the device. + * + * <p>This function can only be called by a device owner, a profile owner or holders of the + * permission {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_APP_FUNCTIONS}. + * + * @param policy The app functions policy to set. One of {@link + * #APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY}, + * {@link #APP_FUNCTIONS_DISABLED} or + * {@link #APP_FUNCTIONS_DISABLED_CROSS_PROFILE} + * @throws SecurityException if caller is not a device owner, a profile owner or a holder + * of the permission {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_APP_FUNCTIONS}. + */ + @RequiresPermission(value = MANAGE_DEVICE_POLICY_APP_FUNCTIONS, conditional = true) + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + public void setAppFunctionsPolicy(@AppFunctionsPolicy int policy) { + throwIfParentInstance("setAppFunctionsPolicy"); + if (mService != null) { + try { + mService.setAppFunctionsPolicy(mContext.getPackageName(), policy); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + } + + /** + * Returns the current app functions policy. + * + * <p>The returned policy will be the current resolved policy rather than the policy set by the + * calling admin. + * + * @throws SecurityException if caller is not a device owner, a profile owner or a holder + * of the permission {@link android.Manifest.permission#MANAGE_DEVICE_POLICY_APP_FUNCTIONS}. + */ + @RequiresPermission(value = MANAGE_DEVICE_POLICY_APP_FUNCTIONS, conditional = true) + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + public @AppFunctionsPolicy int getAppFunctionsPolicy() { + throwIfParentInstance("getAppFunctionsPolicy"); + if (mService != null) { + try { + return mService.getAppFunctionsPolicy(mContext.getPackageName(), + myUserId()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + return APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY; + } + + /** * This object is a single place to tack on invalidation and disable calls. All * binder caches in this class derive from this Config, so all can be invalidated or * disabled through this Config. diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 03a9f9955086..f304c1bf0a88 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -644,4 +644,7 @@ interface IDevicePolicyManager { int getPolicySizeForAdmin(String callerPackageName, in EnforcingAdmin admin); int getHeadlessDeviceOwnerMode(String callerPackageName); + + void setAppFunctionsPolicy(String callerPackageName, int policy); + int getAppFunctionsPolicy(String callerPackageName, int userId); } diff --git a/core/java/android/app/admin/UnknownAuthority.java b/core/java/android/app/admin/UnknownAuthority.java index 82dcf7e1a115..bebffdea5f02 100644 --- a/core/java/android/app/admin/UnknownAuthority.java +++ b/core/java/android/app/admin/UnknownAuthority.java @@ -74,14 +74,14 @@ public final class UnknownAuthority extends Authority { @Override public boolean equals(@Nullable Object o) { if (this == o) return true; - if (o != null && getClass() == o.getClass()) return false; + if (o == null || getClass() != o.getClass()) return false; UnknownAuthority other = (UnknownAuthority) o; return Objects.equals(mName, other.mName); } @Override public int hashCode() { - return mName.hashCode(); + return Objects.hashCode(mName); } @Override diff --git a/core/java/android/app/admin/flags/flags.aconfig b/core/java/android/app/admin/flags/flags.aconfig index 22bc356899f4..361ba73817c7 100644 --- a/core/java/android/app/admin/flags/flags.aconfig +++ b/core/java/android/app/admin/flags/flags.aconfig @@ -398,6 +398,7 @@ flag { flag { name: "split_create_managed_profile_enabled" + is_exported: true namespace: "enterprise" description: "Split up existing create and provision managed profile API." bug: "375382324" diff --git a/core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java b/core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java index a88198a4ec7c..bdc6ce5c73e8 100644 --- a/core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java +++ b/core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java @@ -136,6 +136,16 @@ public final class ExecuteAppFunctionRequest implements Parcelable { return mExtras; } + /** + * Returns the size of the request in bytes. + * + * @hide + */ + public int getRequestDataSize() { + return mTargetPackageName.getBytes().length + mFunctionIdentifier.getBytes().length + + mParameters.getDataSize() + mExtras.getSize(); + } + @Override public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeString8(mTargetPackageName); diff --git a/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java b/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java index a4952f486059..618cc1ca48f9 100644 --- a/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java +++ b/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java @@ -135,6 +135,15 @@ public final class ExecuteAppFunctionResponse implements Parcelable { return mExtras; } + /** + * Returns the size of the response in bytes. + * + * @hide + */ + public int getResponseDataSize() { + return mResultDocumentWrapper.getDataSize() + mExtras.getSize(); + } + @Override public int describeContents() { return 0; diff --git a/core/java/android/app/appfunctions/GenericDocumentWrapper.java b/core/java/android/app/appfunctions/GenericDocumentWrapper.java index 541ca7458efe..02133b475ec2 100644 --- a/core/java/android/app/appfunctions/GenericDocumentWrapper.java +++ b/core/java/android/app/appfunctions/GenericDocumentWrapper.java @@ -50,6 +50,10 @@ public final class GenericDocumentWrapper implements Parcelable { @Nullable private Parcel mParcel; + @GuardedBy("mLock") + @Nullable + private Integer mDataSize; + private final Object mLock = new Object(); public static final Creator<GenericDocumentWrapper> CREATOR = @@ -75,11 +79,13 @@ public final class GenericDocumentWrapper implements Parcelable { public GenericDocumentWrapper(@NonNull GenericDocument genericDocument) { mGenericDocument = Objects.requireNonNull(genericDocument); mParcel = null; + mDataSize = null; } public GenericDocumentWrapper(@NonNull Parcel parcel) { mGenericDocument = null; mParcel = Objects.requireNonNull(parcel); + mDataSize = mParcel.dataSize(); } /** Returns the wrapped {@link android.app.appsearch.GenericDocument} */ @@ -109,6 +115,21 @@ public final class GenericDocumentWrapper implements Parcelable { } } + /** Returns the size of the parcelled document. */ + + int getDataSize() { + synchronized (mLock) { + if (mDataSize != null) { + return mDataSize; + } + Parcel tempParcel = Parcel.obtain(); + writeToParcel(tempParcel, 0); + mDataSize = tempParcel.dataSize(); + tempParcel.recycle(); + return mDataSize; + } + } + @Override public int describeContents() { return 0; diff --git a/core/java/android/app/performance.aconfig b/core/java/android/app/performance.aconfig index 359c84eeb559..82c7617746e6 100644 --- a/core/java/android/app/performance.aconfig +++ b/core/java/android/app/performance.aconfig @@ -37,6 +37,14 @@ flag { flag { namespace: "system_performance" + name: "pic_separate_permission_notifications" + is_fixed_read_only: true + description: "Seperate PermissionManager notifications from cache udpates" + bug: "373752556" +} + +flag { + namespace: "system_performance" name: "pic_cache_nulls" is_fixed_read_only: true description: "Cache null returns from binder calls" diff --git a/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java b/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java index 2b52681d1be8..75ecabd8ddb0 100644 --- a/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java +++ b/core/java/android/app/servertransaction/ActivityConfigurationChangeItem.java @@ -56,7 +56,7 @@ public class ActivityConfigurationChangeItem extends ActivityTransactionItem { @Override public void preExecute(@NonNull ClientTransactionHandler client) { - CompatibilityInfo.applyOverrideScaleIfNeeded(mConfiguration); + CompatibilityInfo.applyOverrideIfNeeded(mConfiguration); // Notify the client of an upcoming change in the token configuration. This ensures that // batches of config change items only process the newest configuration. client.updatePendingActivityConfiguration(getActivityToken(), mConfiguration); diff --git a/core/java/android/app/servertransaction/ActivityRelaunchItem.java b/core/java/android/app/servertransaction/ActivityRelaunchItem.java index cecf7013c79c..bb881908d10f 100644 --- a/core/java/android/app/servertransaction/ActivityRelaunchItem.java +++ b/core/java/android/app/servertransaction/ActivityRelaunchItem.java @@ -89,7 +89,7 @@ public class ActivityRelaunchItem extends ActivityTransactionItem { public void preExecute(@NonNull ClientTransactionHandler client) { // The local config is already scaled so only apply if this item is from server side. if (!client.isExecutingLocalTransaction()) { - CompatibilityInfo.applyOverrideScaleIfNeeded(mConfig); + CompatibilityInfo.applyOverrideIfNeeded(mConfig); } mActivityClientRecord = client.prepareRelaunchActivity(getActivityToken(), mPendingResults, mPendingNewIntents, mConfigChanges, mConfig, mPreserveWindow, mActivityWindowInfo); diff --git a/core/java/android/app/servertransaction/ConfigurationChangeItem.java b/core/java/android/app/servertransaction/ConfigurationChangeItem.java index 123d7926160c..e42005bdd595 100644 --- a/core/java/android/app/servertransaction/ConfigurationChangeItem.java +++ b/core/java/android/app/servertransaction/ConfigurationChangeItem.java @@ -46,7 +46,7 @@ public class ConfigurationChangeItem extends ClientTransactionItem { @Override public void preExecute(@NonNull ClientTransactionHandler client) { - CompatibilityInfo.applyOverrideScaleIfNeeded(mConfiguration); + CompatibilityInfo.applyOverrideIfNeeded(mConfiguration); client.updatePendingConfiguration(mConfiguration); } diff --git a/core/java/android/app/servertransaction/LaunchActivityItem.java b/core/java/android/app/servertransaction/LaunchActivityItem.java index 235a9f7aeb4c..f2e7a4fcd50b 100644 --- a/core/java/android/app/servertransaction/LaunchActivityItem.java +++ b/core/java/android/app/servertransaction/LaunchActivityItem.java @@ -202,8 +202,8 @@ public class LaunchActivityItem extends ClientTransactionItem { public void preExecute(@NonNull ClientTransactionHandler client) { client.countLaunchingActivities(1); client.updateProcessState(mProcState, false); - CompatibilityInfo.applyOverrideScaleIfNeeded(mCurConfig); - CompatibilityInfo.applyOverrideScaleIfNeeded(mOverrideConfig); + CompatibilityInfo.applyOverrideIfNeeded(mCurConfig); + CompatibilityInfo.applyOverrideIfNeeded(mOverrideConfig); client.updatePendingConfiguration(mCurConfig); if (mActivityClientController != null) { ActivityClient.setActivityClientController(mActivityClientController); diff --git a/core/java/android/app/servertransaction/MoveToDisplayItem.java b/core/java/android/app/servertransaction/MoveToDisplayItem.java index 1aa563aa6363..72d1f491f2c6 100644 --- a/core/java/android/app/servertransaction/MoveToDisplayItem.java +++ b/core/java/android/app/servertransaction/MoveToDisplayItem.java @@ -58,7 +58,7 @@ public class MoveToDisplayItem extends ActivityTransactionItem { @Override public void preExecute(@NonNull ClientTransactionHandler client) { - CompatibilityInfo.applyOverrideScaleIfNeeded(mConfiguration); + CompatibilityInfo.applyOverrideIfNeeded(mConfiguration); // Notify the client of an upcoming change in the token configuration. This ensures that // batches of config change items only process the newest configuration. client.updatePendingActivityConfiguration(getActivityToken(), mConfiguration); diff --git a/core/java/android/app/wallpaper/WallpaperDescription.java b/core/java/android/app/wallpaper/WallpaperDescription.java index 3ee00ca3d941..ca2d9e676a02 100644 --- a/core/java/android/app/wallpaper/WallpaperDescription.java +++ b/core/java/android/app/wallpaper/WallpaperDescription.java @@ -20,6 +20,7 @@ import static android.app.Flags.FLAG_LIVE_WALLPAPER_CONTENT_HANDLING; import android.annotation.FlaggedApi; import android.annotation.SuppressLint; +import android.annotation.SystemApi; import android.annotation.TestApi; import android.app.WallpaperInfo; import android.app.WallpaperManager; @@ -153,6 +154,7 @@ public final class WallpaperDescription implements Parcelable { * {@link Builder#setCropHints(SparseArray)} * @hide */ + @SystemApi @NonNull public SparseArray<Rect> getCropHints() { return mCropHints; diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index d7660172a2f1..18d8c3a94e0c 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -6187,7 +6187,8 @@ public class Intent implements Parcelable, Cloneable { * {@link #EXTRA_CHOOSER_MODIFY_SHARE_ACTION}, * {@link #EXTRA_METADATA_TEXT}, * {@link #EXTRA_CHOOSER_REFINEMENT_INTENT_SENDER}, - * {@link #EXTRA_CHOOSER_RESULT_INTENT_SENDER}. + * {@link #EXTRA_CHOOSER_RESULT_INTENT_SENDER}, + * {@link #EXTRA_EXCLUDE_COMPONENTS}. * </p> */ public static final String EXTRA_CHOOSER_ADDITIONAL_CONTENT_URI = @@ -7856,6 +7857,10 @@ public class Intent implements Parcelable, Cloneable { */ public static final int URI_ALLOW_UNSAFE = 1<<2; + static { + Bundle.intentClass = Intent.class; + } + // --------------------------------------------------------------------- private String mAction; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a06eb1c5b4ad..7e0805137d0b 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -11651,7 +11651,7 @@ public abstract class PackageManager { private static final PropertyInvalidatedCache<ApplicationInfoQuery, ApplicationInfo> sApplicationInfoCache = new PropertyInvalidatedCache<ApplicationInfoQuery, ApplicationInfo>( - 2048, PermissionManager.CACHE_KEY_PACKAGE_INFO, + 2048, PermissionManager.CACHE_KEY_PACKAGE_INFO_CACHE, "getApplicationInfo") { @Override public ApplicationInfo recompute(ApplicationInfoQuery query) { @@ -11682,18 +11682,6 @@ public abstract class PackageManager { sApplicationInfoCache.disableLocal(); } - private static final PropertyInvalidatedCache.AutoCorker sCacheAutoCorker = - new PropertyInvalidatedCache.AutoCorker(PermissionManager.CACHE_KEY_PACKAGE_INFO); - - /** - * Invalidate caches of package and permission information system-wide. - * - * @hide - */ - public static void invalidatePackageInfoCache() { - sCacheAutoCorker.autoCork(); - } - // Some of the flags don't affect the query result, but let's be conservative and cache // each combination of flags separately. @@ -11752,7 +11740,7 @@ public abstract class PackageManager { private static final PropertyInvalidatedCache<PackageInfoQuery, PackageInfo> sPackageInfoCache = new PropertyInvalidatedCache<PackageInfoQuery, PackageInfo>( - 2048, PermissionManager.CACHE_KEY_PACKAGE_INFO, + 2048, PermissionManager.CACHE_KEY_PACKAGE_INFO_CACHE, "getPackageInfo") { @Override public PackageInfo recompute(PackageInfoQuery query) { @@ -11784,17 +11772,40 @@ public abstract class PackageManager { /** * Inhibit package info cache invalidations when correct. * - * @hide */ + * @hide + */ public static void corkPackageInfoCache() { - PropertyInvalidatedCache.corkInvalidations(PermissionManager.CACHE_KEY_PACKAGE_INFO); + sPackageInfoCache.corkInvalidations(); } /** * Enable package info cache invalidations. * - * @hide */ + * @hide + */ public static void uncorkPackageInfoCache() { - PropertyInvalidatedCache.uncorkInvalidations(PermissionManager.CACHE_KEY_PACKAGE_INFO); + sPackageInfoCache.uncorkInvalidations(); + } + + // This auto-corker is obsolete once the separate permission notifications feature is + // committed. + private static final PropertyInvalidatedCache.AutoCorker sCacheAutoCorker = + PropertyInvalidatedCache.separatePermissionNotificationsEnabled() + ? null + : new PropertyInvalidatedCache + .AutoCorker(PermissionManager.CACHE_KEY_PACKAGE_INFO_CACHE); + + /** + * Invalidate caches of package and permission information system-wide. + * + * @hide + */ + public static void invalidatePackageInfoCache() { + if (PropertyInvalidatedCache.separatePermissionNotificationsEnabled()) { + sPackageInfoCache.invalidateCache(); + } else { + sCacheAutoCorker.autoCork(); + } } /** diff --git a/core/java/android/content/pm/flags.aconfig b/core/java/android/content/pm/flags.aconfig index 8ba2dcc2a7cf..dfeee2a2335f 100644 --- a/core/java/android/content/pm/flags.aconfig +++ b/core/java/android/content/pm/flags.aconfig @@ -354,14 +354,6 @@ flag { } flag { - name: "support_minor_versions_in_minsdkversion" - namespace: "package_manager_service" - description: "Block app installations that specify an incompatible minor SDK version" - bug: "377302905" - is_exported: true -} - -flag { name: "app_compat_option_16kb" is_exported: true namespace: "devoptions_settings" diff --git a/core/java/android/content/res/CompatibilityInfo.java b/core/java/android/content/res/CompatibilityInfo.java index d6620d19ccf0..afcdcb0fbcad 100644 --- a/core/java/android/content/res/CompatibilityInfo.java +++ b/core/java/android/content/res/CompatibilityInfo.java @@ -17,7 +17,9 @@ package android.content.res; import android.annotation.Nullable; +import android.app.WindowConfiguration; import android.compat.annotation.UnsupportedAppUsage; +import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.graphics.Canvas; import android.graphics.Insets; @@ -34,14 +36,17 @@ import android.util.MergedConfiguration; import android.view.InsetsSourceControl; import android.view.InsetsState; import android.view.MotionEvent; +import android.view.Surface; import android.view.WindowManager; import android.view.WindowManager.LayoutParams; +import com.android.aconfig.annotations.VisibleForTesting; + /** * CompatibilityInfo class keeps the information about the screen compatibility mode that the * application is running under. - * - * {@hide} + * + * {@hide} */ @RavenwoodKeepWholeClass public class CompatibilityInfo implements Parcelable { @@ -129,12 +134,37 @@ public class CompatibilityInfo implements Parcelable { */ public final float applicationDensityInvertedScale; + /** + * Application's display rotation. + * + * <p>This field is used to sandbox fixed-orientation activities on displays or display areas + * with ignoreOrientationRequest, where the display orientation is more likely to be different + * from the orientation the activity requested (e.g. in desktop windowing, or letterboxed). + * Mainly set for activities which use the display rotation to orient their content, for example + * camera previews. + * + * <p>In the case of camera activities, assuming the wrong posture + * can lead to sideways or stretched previews. As part of camera compat treatment for desktop + * windowing, the app is sandboxed to believe that the app and the device are in the posture the + * app requested. For example for portrait fixed-orientation apps, the app is letterboxed to + * portrait, camera feed is cropped to portrait, and the display rotation is changed via this + * field, for example to {@link Surface.Rotation#ROTATION_0} on devices with portrait natural + * orientation. All of these parameters factor in common calculations for setting up the camera + * preview. + */ + @Surface.Rotation + public int applicationDisplayRotation = WindowConfiguration.ROTATION_UNDEFINED; + /** The process level override inverted scale. See {@link #HAS_OVERRIDE_SCALING}. */ private static float sOverrideInvertedScale = 1f; /** The process level override inverted density scale. See {@link #HAS_OVERRIDE_SCALING}. */ private static float sOverrideDensityInvertScale = 1f; + /** The process level override display rotation. */ + @Surface.Rotation + private static int sOverrideDisplayRotation = WindowConfiguration.ROTATION_UNDEFINED; + @UnsupportedAppUsage @Deprecated public CompatibilityInfo(ApplicationInfo appInfo, int screenLayout, int sw, @@ -346,11 +376,16 @@ public class CompatibilityInfo implements Parcelable { return (mCompatibilityFlags & HAS_OVERRIDE_SCALING) != 0; } + /** Returns {@code true} if {@link #sOverrideDisplayRotation} should be set. */ + public boolean isOverrideDisplayRotationRequired() { + return applicationDisplayRotation != WindowConfiguration.ROTATION_UNDEFINED; + } + @UnsupportedAppUsage public boolean supportsScreen() { return (mCompatibilityFlags&NEEDS_SCREEN_COMPAT) == 0; } - + public boolean neverSupportsScreen() { return (mCompatibilityFlags&ALWAYS_NEEDS_COMPAT) != 0; } @@ -618,6 +653,9 @@ public class CompatibilityInfo implements Parcelable { } public void applyToConfiguration(int displayDensity, Configuration inoutConfig) { + if (hasOverrideDisplayRotation()) { + applyDisplayRotationConfiguration(sOverrideDisplayRotation, inoutConfig); + } if (hasOverrideScale()) return; if (!supportsScreen()) { // This is a larger screen device and the app is not @@ -650,21 +688,42 @@ public class CompatibilityInfo implements Parcelable { inoutConfig.windowConfiguration.scale(invertScale); } - /** @see #sOverrideInvertedScale */ - public static void applyOverrideScaleIfNeeded(Configuration config) { - if (!hasOverrideScale()) return; - scaleConfiguration(sOverrideInvertedScale, sOverrideDensityInvertScale, config); + /** Changes the WindowConfiguration display rotation for the given configuration. */ + public static void applyDisplayRotationConfiguration(@Surface.Rotation int displayRotation, + Configuration inoutConfig) { + if (displayRotation != WindowConfiguration.ROTATION_UNDEFINED) { + inoutConfig.windowConfiguration.setDisplayRotation(displayRotation); + } } - /** @see #sOverrideInvertedScale */ - public static void applyOverrideScaleIfNeeded(MergedConfiguration mergedConfig) { - if (!hasOverrideScale()) return; - scaleConfiguration(sOverrideInvertedScale, sOverrideDensityInvertScale, - mergedConfig.getGlobalConfiguration()); - scaleConfiguration(sOverrideInvertedScale, sOverrideDensityInvertScale, - mergedConfig.getOverrideConfiguration()); - scaleConfiguration(sOverrideInvertedScale, sOverrideDensityInvertScale, - mergedConfig.getMergedConfiguration()); + /** @see #sOverrideInvertedScale and #sOverrideDisplayRotation. */ + public static void applyOverrideIfNeeded(Configuration config) { + if (hasOverrideDisplayRotation()) { + applyDisplayRotationConfiguration(sOverrideDisplayRotation, config); + } + if (hasOverrideScale()) { + scaleConfiguration(sOverrideInvertedScale, sOverrideDensityInvertScale, config); + } + } + + /** @see #sOverrideInvertedScale and #sOverrideDisplayRotation. */ + public static void applyOverrideIfNeeded(MergedConfiguration mergedConfig) { + if (hasOverrideDisplayRotation()) { + applyDisplayRotationConfiguration(sOverrideDisplayRotation, + mergedConfig.getGlobalConfiguration()); + applyDisplayRotationConfiguration(sOverrideDisplayRotation, + mergedConfig.getOverrideConfiguration()); + applyDisplayRotationConfiguration(sOverrideDisplayRotation, + mergedConfig.getMergedConfiguration()); + } + if (hasOverrideScale()) { + scaleConfiguration(sOverrideInvertedScale, sOverrideDensityInvertScale, + mergedConfig.getGlobalConfiguration()); + scaleConfiguration(sOverrideInvertedScale, sOverrideDensityInvertScale, + mergedConfig.getOverrideConfiguration()); + scaleConfiguration(sOverrideInvertedScale, sOverrideDensityInvertScale, + mergedConfig.getMergedConfiguration()); + } } /** Returns {@code true} if this process is in a environment with override scale. */ @@ -693,6 +752,22 @@ public class CompatibilityInfo implements Parcelable { return sOverrideDensityInvertScale; } + /** Returns {@code true} if this process is in a environment with override display rotation. */ + private static boolean hasOverrideDisplayRotation() { + return sOverrideDisplayRotation != WindowConfiguration.ROTATION_UNDEFINED; + } + + /** @see #sOverrideInvertedScale */ + public static void setOverrideDisplayRotation(@Surface.Rotation int displayRotation) { + sOverrideDisplayRotation = displayRotation; + } + + /** @see #sOverrideDisplayRotation */ + @VisibleForTesting + public static int getOverrideDisplayRotation() { + return sOverrideDisplayRotation; + } + /** * Compute the frame Rect for applications runs under compatibility mode. * @@ -747,18 +822,50 @@ public class CompatibilityInfo implements Parcelable { if (this == o) { return true; } - try { - CompatibilityInfo oc = (CompatibilityInfo)o; - if (mCompatibilityFlags != oc.mCompatibilityFlags) return false; - if (applicationDensity != oc.applicationDensity) return false; - if (applicationScale != oc.applicationScale) return false; - if (applicationInvertedScale != oc.applicationInvertedScale) return false; - if (applicationDensityScale != oc.applicationDensityScale) return false; - if (applicationDensityInvertedScale != oc.applicationDensityInvertedScale) return false; - return true; - } catch (ClassCastException e) { + + if (!(o instanceof CompatibilityInfo oc)) { return false; } + + if (!isCompatibilityFlagsEqual(oc)) return false; + if (!isScaleEqual(oc)) return false; + if (!isDisplayRotationEqual(oc)) return false; + return true; + } + + /** + * Checks the difference between this and given {@link CompatibilityInfo} o, and returns the + * combination of {@link ActivityInfo}.CONFIG_* changes that this difference should trigger. + */ + public int getCompatibilityChangesForConfig(@Nullable CompatibilityInfo o) { + int changes = 0; + if (!isDisplayRotationEqual(o)) { + changes |= ActivityInfo.CONFIG_WINDOW_CONFIGURATION; + } + if (!isScaleEqual(o) || !isCompatibilityFlagsEqual(o)) { + changes |= ActivityInfo.CONFIG_SCREEN_LAYOUT + | ActivityInfo.CONFIG_SCREEN_SIZE + | ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE; + } + return changes; + } + + private boolean isScaleEqual(@Nullable CompatibilityInfo oc) { + if (oc == null) return false; + if (applicationDensity != oc.applicationDensity) return false; + if (applicationScale != oc.applicationScale) return false; + if (applicationInvertedScale != oc.applicationInvertedScale) return false; + if (applicationDensityScale != oc.applicationDensityScale) return false; + if (applicationDensityInvertedScale != oc.applicationDensityInvertedScale) return false; + return true; + } + + private boolean isDisplayRotationEqual(@Nullable CompatibilityInfo oc) { + return oc != null && oc.applicationDisplayRotation == applicationDisplayRotation; + } + + private boolean isCompatibilityFlagsEqual(@Nullable CompatibilityInfo oc) { + return oc != null && oc.mCompatibilityFlags == mCompatibilityFlags; } @Override @@ -778,6 +885,10 @@ public class CompatibilityInfo implements Parcelable { sb.append(" overrideDensityInvScale="); sb.append(applicationDensityInvertedScale); } + if (isOverrideDisplayRotationRequired()) { + sb.append(" overrideDisplayRotation="); + sb.append(applicationDisplayRotation); + } if (!supportsScreen()) { sb.append(" resizing"); } @@ -800,6 +911,7 @@ public class CompatibilityInfo implements Parcelable { result = 31 * result + Float.floatToIntBits(applicationInvertedScale); result = 31 * result + Float.floatToIntBits(applicationDensityScale); result = 31 * result + Float.floatToIntBits(applicationDensityInvertedScale); + result = 31 * result + applicationDisplayRotation; return result; } @@ -816,6 +928,7 @@ public class CompatibilityInfo implements Parcelable { dest.writeFloat(applicationInvertedScale); dest.writeFloat(applicationDensityScale); dest.writeFloat(applicationDensityInvertedScale); + dest.writeInt(applicationDisplayRotation); } @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @@ -839,6 +952,7 @@ public class CompatibilityInfo implements Parcelable { applicationInvertedScale = source.readFloat(); applicationDensityScale = source.readFloat(); applicationDensityInvertedScale = source.readFloat(); + applicationDisplayRotation = source.readInt(); } /** diff --git a/core/java/android/credentials/flags.aconfig b/core/java/android/credentials/flags.aconfig index 6c35d106bfb7..68f17e2cd25a 100644 --- a/core/java/android/credentials/flags.aconfig +++ b/core/java/android/credentials/flags.aconfig @@ -87,6 +87,16 @@ flag { flag { namespace: "credential_manager" + name: "framework_session_id_metric_bundle" + description: "Enables the session_id to be passed across to the UI logs" + bug: "379880133" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + namespace: "credential_manager" name: "clear_credentials_fix_enabled" description: "Fixes bug in clearCredential API that causes indefinite suspension" bug: "314926460" diff --git a/core/java/android/hardware/contexthub/HubEndpointSession.java b/core/java/android/hardware/contexthub/HubEndpointSession.java index cf952cbdbfdc..b3d65c1a4cae 100644 --- a/core/java/android/hardware/contexthub/HubEndpointSession.java +++ b/core/java/android/hardware/contexthub/HubEndpointSession.java @@ -19,6 +19,7 @@ package android.hardware.contexthub; import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.RequiresPermission; import android.annotation.SystemApi; import android.chre.flags.Flags; import android.hardware.location.ContextHubTransaction; @@ -70,6 +71,7 @@ public class HubEndpointSession implements AutoCloseable { * receiving the response for the message. */ @NonNull + @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public ContextHubTransaction<Void> sendMessage(@NonNull HubMessage message) { if (mIsClosed.get()) { throw new IllegalStateException("Session is already closed."); @@ -120,6 +122,7 @@ public class HubEndpointSession implements AutoCloseable { * <p>When this function is invoked, the messaging associated with this session is invalidated. * All futures messages targeted for this client are dropped. */ + @RequiresPermission(android.Manifest.permission.ACCESS_CONTEXT_HUB) public void close() { if (!mIsClosed.getAndSet(true)) { mCloseGuard.close(); diff --git a/core/java/android/hardware/display/VirtualDisplayConfig.java b/core/java/android/hardware/display/VirtualDisplayConfig.java index eceaa8ff4c95..72570553f78a 100644 --- a/core/java/android/hardware/display/VirtualDisplayConfig.java +++ b/core/java/android/hardware/display/VirtualDisplayConfig.java @@ -66,6 +66,7 @@ public final class VirtualDisplayConfig implements Parcelable { private final DisplayCutout mDisplayCutout; private final boolean mIgnoreActivitySizeRestrictions; private final float mDefaultBrightness; + private final float mDimBrightness; private final IBrightnessListener mBrightnessListener; private VirtualDisplayConfig( @@ -84,6 +85,7 @@ public final class VirtualDisplayConfig implements Parcelable { @Nullable DisplayCutout displayCutout, boolean ignoreActivitySizeRestrictions, @FloatRange(from = 0.0f, to = 1.0f) float defaultBrightness, + @FloatRange(from = 0.0f, to = 1.0f) float dimBrightness, IBrightnessListener brightnessListener) { mName = name; mWidth = width; @@ -100,6 +102,7 @@ public final class VirtualDisplayConfig implements Parcelable { mDisplayCutout = displayCutout; mIgnoreActivitySizeRestrictions = ignoreActivitySizeRestrictions; mDefaultBrightness = defaultBrightness; + mDimBrightness = dimBrightness; mBrightnessListener = brightnessListener; } @@ -180,6 +183,19 @@ public final class VirtualDisplayConfig implements Parcelable { } /** + * Returns the dim brightness of the display. + * + * <p>Value of {@code 0.0} indicates the minimum supported brightness and value of {@code 1.0} + * indicates the maximum supported brightness.</p> + * + * @see Builder#setDimBrightness(float) + */ + @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) + public @FloatRange(from = 0.0f, to = 1.0f) float getDimBrightness() { + return mDimBrightness; + } + + /** * Returns the listener to get notified about changes in the display brightness. * @hide */ @@ -278,6 +294,7 @@ public final class VirtualDisplayConfig implements Parcelable { DisplayCutout.ParcelableWrapper.writeCutoutToParcel(mDisplayCutout, dest, flags); dest.writeBoolean(mIgnoreActivitySizeRestrictions); dest.writeFloat(mDefaultBrightness); + dest.writeFloat(mDimBrightness); dest.writeStrongBinder(mBrightnessListener != null ? mBrightnessListener.asBinder() : null); } @@ -308,8 +325,8 @@ public final class VirtualDisplayConfig implements Parcelable { && mIgnoreActivitySizeRestrictions == that.mIgnoreActivitySizeRestrictions && Objects.equals(mDisplayCutout, that.mDisplayCutout) && mDefaultBrightness == that.mDefaultBrightness + && mDimBrightness == that.mDimBrightness && Objects.equals(mBrightnessListener, that.mBrightnessListener); - } @Override @@ -318,7 +335,8 @@ public final class VirtualDisplayConfig implements Parcelable { mName, mWidth, mHeight, mDensityDpi, mFlags, mSurface, mUniqueId, mDisplayIdToMirror, mWindowManagerMirroringEnabled, mDisplayCategories, mRequestedRefreshRate, mIsHomeSupported, mDisplayCutout, - mIgnoreActivitySizeRestrictions, mDefaultBrightness, mBrightnessListener); + mIgnoreActivitySizeRestrictions, mDefaultBrightness, mDimBrightness, + mBrightnessListener); return hashCode; } @@ -341,6 +359,7 @@ public final class VirtualDisplayConfig implements Parcelable { + " mDisplayCutout=" + mDisplayCutout + " mIgnoreActivitySizeRestrictions=" + mIgnoreActivitySizeRestrictions + " mDefaultBrightness=" + mDefaultBrightness + + " mDimBrightness=" + mDimBrightness + ")"; } @@ -360,8 +379,8 @@ public final class VirtualDisplayConfig implements Parcelable { mDisplayCutout = DisplayCutout.ParcelableWrapper.readCutoutFromParcel(in); mIgnoreActivitySizeRestrictions = in.readBoolean(); mDefaultBrightness = in.readFloat(); + mDimBrightness = in.readFloat(); mBrightnessListener = IBrightnessListener.Stub.asInterface(in.readStrongBinder()); - } /** @@ -432,6 +451,7 @@ public final class VirtualDisplayConfig implements Parcelable { private DisplayCutout mDisplayCutout = null; private boolean mIgnoreActivitySizeRestrictions = false; private float mDefaultBrightness = 0.0f; + private float mDimBrightness = PowerManager.BRIGHTNESS_INVALID; private IBrightnessListener mBrightnessListener = null; /** @@ -635,14 +655,14 @@ public final class VirtualDisplayConfig implements Parcelable { * * <p>If unset, defaults to {@code 0.0}</p> * + * @throws IllegalArgumentException if the brightness is outside the valid range [0.0, 1.0] * @see android.view.View#setKeepScreenOn(boolean) * @see #setBrightnessListener(Executor, BrightnessListener) */ @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) @NonNull public Builder setDefaultBrightness(@FloatRange(from = 0.0f, to = 1.0f) float brightness) { - if (brightness < PowerManager.BRIGHTNESS_MIN - || brightness > PowerManager.BRIGHTNESS_MAX) { + if (!isValidBrightness(brightness)) { throw new IllegalArgumentException( "Virtual display default brightness must be in range [0.0, 1.0]"); } @@ -651,6 +671,33 @@ public final class VirtualDisplayConfig implements Parcelable { } /** + * Sets the dim brightness of the display. + * + * <p>The system will use this brightness value whenever the display should be dim, i.e. + * it is powered on and dimmed due to user activity or app activity.</p> + * + * <p>Value of {@code 0.0} indicates the minimum supported brightness and value of + * {@code 1.0} indicates the maximum supported brightness.</p> + * + * <p>If set, the default brightness must also be set to a value greater or equal to the + * dim brightness. If unset, defaults to the system default.</p> + * + * @throws IllegalArgumentException if the brightness is outside the valid range [0.0, 1.0] + * @see Builder#setDefaultBrightness(float) + * @see #setBrightnessListener(Executor, BrightnessListener) + */ + @FlaggedApi(android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER) + @NonNull + public Builder setDimBrightness(@FloatRange(from = 0.0f, to = 1.0f) float brightness) { + if (!isValidBrightness(brightness)) { + throw new IllegalArgumentException( + "Virtual display dim brightness must be in range [0.0, 1.0]"); + } + mDimBrightness = brightness; + return this; + } + + /** * Sets the listener to get notified about changes in the display brightness. * * @param executor The executor where the callback is executed on. @@ -666,11 +713,23 @@ public final class VirtualDisplayConfig implements Parcelable { return this; } + private boolean isValidBrightness(float brightness) { + return !Float.isNaN(brightness) && PowerManager.BRIGHTNESS_MIN <= brightness + && brightness <= PowerManager.BRIGHTNESS_MAX; + } + /** * Builds the {@link VirtualDisplayConfig} instance. + * + * @throws IllegalArgumentException if the dim brightness is set to a value greater than + * the default brightness. */ @NonNull public VirtualDisplayConfig build() { + if (isValidBrightness(mDimBrightness) && mDimBrightness > mDefaultBrightness) { + throw new IllegalArgumentException( + "The dim brightness must not be greater than the default brightness"); + } return new VirtualDisplayConfig( mName, mWidth, @@ -687,6 +746,7 @@ public final class VirtualDisplayConfig implements Parcelable { mDisplayCutout, mIgnoreActivitySizeRestrictions, mDefaultBrightness, + mDimBrightness, mBrightnessListener); } } diff --git a/core/java/android/hardware/input/InputSettings.java b/core/java/android/hardware/input/InputSettings.java index 3f9317aa24f1..f8f7f5e0586e 100644 --- a/core/java/android/hardware/input/InputSettings.java +++ b/core/java/android/hardware/input/InputSettings.java @@ -28,7 +28,6 @@ import static com.android.hardware.input.Flags.keyboardA11yStickyKeysFlag; import static com.android.hardware.input.Flags.mouseReverseVerticalScrolling; import static com.android.hardware.input.Flags.mouseSwapPrimaryButton; import static com.android.hardware.input.Flags.touchpadSystemGestureDisable; -import static com.android.hardware.input.Flags.touchpadTapDragging; import static com.android.hardware.input.Flags.touchpadThreeFingerTapShortcut; import static com.android.hardware.input.Flags.touchpadVisualizer; import static com.android.hardware.input.Flags.useKeyGestureEventHandler; @@ -366,15 +365,6 @@ public class InputSettings { } /** - * Returns true if the feature flag for touchpad tap dragging is enabled. - * - * @hide - */ - public static boolean isTouchpadTapDraggingFeatureFlagEnabled() { - return touchpadTapDragging(); - } - - /** * Returns true if the feature flag for disabling system gestures on touchpads is enabled. * * @hide @@ -461,9 +451,6 @@ public class InputSettings { * @hide */ public static boolean useTouchpadTapDragging(@NonNull Context context) { - if (!isTouchpadTapDraggingFeatureFlagEnabled()) { - return false; - } return Settings.System.getIntForUser(context.getContentResolver(), Settings.System.TOUCHPAD_TAP_DRAGGING, 0, UserHandle.USER_CURRENT) == 1; } @@ -480,9 +467,6 @@ public class InputSettings { */ @RequiresPermission(Manifest.permission.WRITE_SETTINGS) public static void setTouchpadTapDragging(@NonNull Context context, boolean enabled) { - if (!isTouchpadTapDraggingFeatureFlagEnabled()) { - return; - } Settings.System.putIntForUser(context.getContentResolver(), Settings.System.TOUCHPAD_TAP_DRAGGING, enabled ? 1 : 0, UserHandle.USER_CURRENT); diff --git a/core/java/android/hardware/input/KeyGestureEvent.java b/core/java/android/hardware/input/KeyGestureEvent.java index 711dc3a2cf7c..af756b9217d3 100644 --- a/core/java/android/hardware/input/KeyGestureEvent.java +++ b/core/java/android/hardware/input/KeyGestureEvent.java @@ -43,6 +43,8 @@ public final class KeyGestureEvent { private static final int LOG_EVENT_UNSPECIFIED = FrameworkStatsLog.KEYBOARD_SYSTEMS_EVENT_REPORTED__KEYBOARD_SYSTEM_EVENT__UNSPECIFIED; + // These values should not change and values should not be re-used as this data is persisted to + // long term storage and must be kept backwards compatible. public static final int KEY_GESTURE_TYPE_UNSPECIFIED = 0; public static final int KEY_GESTURE_TYPE_HOME = 1; public static final int KEY_GESTURE_TYPE_RECENT_APPS = 2; diff --git a/core/java/android/hardware/input/input_framework.aconfig b/core/java/android/hardware/input/input_framework.aconfig index ebb617249993..eb7b409e77a6 100644 --- a/core/java/android/hardware/input/input_framework.aconfig +++ b/core/java/android/hardware/input/input_framework.aconfig @@ -37,13 +37,6 @@ flag { flag { namespace: "input_native" - name: "touchpad_tap_dragging" - description: "Offers a setting to enable touchpad tap dragging" - bug: "321978150" -} - -flag { - namespace: "input_native" name: "keyboard_glyph_map" description: "Allows system to provide keyboard specific key drawables and shortcuts via config files" bug: "345440920" diff --git a/core/java/android/net/metrics/DnsEvent.java b/core/java/android/net/metrics/DnsEvent.java index bf351ce07fe8..f53d1c4d191d 100644 --- a/core/java/android/net/metrics/DnsEvent.java +++ b/core/java/android/net/metrics/DnsEvent.java @@ -62,7 +62,11 @@ final public class DnsEvent { return isSuccess; } if (eventCount == eventTypes.length) { - resize((int) (1.4 * eventCount)); + int resizeLength = (int) (1.4 * eventCount); + if (eventCount == resizeLength) { + resizeLength++; + } + resize(resizeLength); } eventTypes[eventCount] = eventType; returnCodes[eventCount] = returnCode; diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index 05bd10b053fe..819d58d9f059 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -70,6 +70,11 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { */ static final int FLAG_VERIFY_TOKENS_PRESENT = 1 << 13; + /** + * Indicates the bundle definitely contains an Intent. + */ + static final int FLAG_HAS_INTENT = 1 << 14; + /** * Status when the Bundle can <b>assert</b> that the underlying Parcel DOES NOT contain @@ -118,6 +123,11 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { public static final Bundle EMPTY; /** + * @hide + */ + public static Class<?> intentClass; + + /** * Special extras used to denote extras have been stripped off. * @hide */ @@ -388,6 +398,7 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { if ((bundle.mFlags & FLAG_HAS_BINDERS_KNOWN) == 0) { mFlags &= ~FLAG_HAS_BINDERS_KNOWN; } + mFlags |= bundle.mFlags & FLAG_HAS_INTENT; } /** @@ -447,6 +458,16 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { } } + /** + * Returns if the bundle definitely contains at least an intent. This method returns false does + * not guarantee the bundle does not contain a nested intent. An intent could still exist in a + * ParcelableArrayList, ParcelableArray, ParcelableList, a bundle in this bundle, etc. + * @hide + */ + public boolean hasIntent() { + return (mFlags & FLAG_HAS_INTENT) != 0; + } + /** {@hide} */ @Override public void putObject(@Nullable String key, @Nullable Object value) { @@ -569,6 +590,9 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { mMap.put(key, value); mFlags &= ~FLAG_HAS_FDS_KNOWN; mFlags &= ~FLAG_HAS_BINDERS_KNOWN; + if (intentClass != null && intentClass.isInstance(value)) { + mFlags |= FLAG_HAS_INTENT; + } } /** diff --git a/core/java/android/os/CombinedMessageQueue/MessageQueue.java b/core/java/android/os/CombinedMessageQueue/MessageQueue.java index 23114c4318c7..804e8faeef16 100644 --- a/core/java/android/os/CombinedMessageQueue/MessageQueue.java +++ b/core/java/android/os/CombinedMessageQueue/MessageQueue.java @@ -19,6 +19,8 @@ package android.os; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.TestApi; +import android.app.ActivityThread; +import android.app.Instrumentation; import android.compat.annotation.UnsupportedAppUsage; import android.os.Process; import android.os.UserHandle; @@ -119,7 +121,7 @@ public final class MessageQueue { MessageQueue(boolean quitAllowed) { initIsProcessAllowedToUseConcurrent(); - mUseConcurrent = sIsProcessAllowedToUseConcurrent; + mUseConcurrent = sIsProcessAllowedToUseConcurrent && !isInstrumenting(); mQuitAllowed = quitAllowed; mPtr = nativeInit(); } @@ -172,6 +174,15 @@ public final class MessageQueue { } } + private static boolean isInstrumenting() { + final ActivityThread activityThread = ActivityThread.currentActivityThread(); + if (activityThread == null) { + return false; + } + final Instrumentation instrumentation = activityThread.getInstrumentation(); + return instrumentation != null && instrumentation.isInstrumenting(); + } + @Override protected void finalize() throws Throwable { try { diff --git a/core/java/android/os/CpuHeadroomParamsInternal.aidl b/core/java/android/os/CpuHeadroomParamsInternal.aidl index d572f965579b..12b209357d9c 100644 --- a/core/java/android/os/CpuHeadroomParamsInternal.aidl +++ b/core/java/android/os/CpuHeadroomParamsInternal.aidl @@ -28,6 +28,5 @@ parcelable CpuHeadroomParamsInternal { int[] tids; int calculationWindowMillis = 1000; CpuHeadroomParams.CalculationType calculationType = CpuHeadroomParams.CalculationType.MIN; - CpuHeadroomParams.SelectionType selectionType = CpuHeadroomParams.SelectionType.ALL; } diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index e85e58039828..4cac4dee0bea 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -55,7 +55,7 @@ interface IPowerManager void goToSleepWithDisplayId(int displayId, long time, int reason, int flags); @UnsupportedAppUsage(maxTargetSdk = 28) void nap(long time); - float getBrightnessConstraint(int constraint); + float getBrightnessConstraint(int displayId, int constraint); @UnsupportedAppUsage boolean isInteractive(); boolean isDisplayInteractive(int displayId); diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS index bfcc5cc6f18e..8d353384f1e2 100644 --- a/core/java/android/os/OWNERS +++ b/core/java/android/os/OWNERS @@ -118,9 +118,10 @@ per-file IpcDataCache.java = file:/PERFORMANCE_OWNERS # Memory per-file OomKillRecord.java = file:/MEMORY_OWNERS -# MessageQueue +# MessageQueue and related classes per-file MessageQueue.java = mfasheh@google.com, shayba@google.com per-file Message.java = mfasheh@google.com, shayba@google.com +per-file TestLooperManager.java = mfasheh@google.com, shayba@google.com # Stats per-file IStatsBootstrapAtomService.aidl = file:/services/core/java/com/android/server/stats/OWNERS diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index bf7116d6a05b..6855d95d718f 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -50,6 +50,7 @@ import com.android.internal.util.ArrayUtils; import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.FastNative; +import dalvik.annotation.optimization.NeverInline; import libcore.util.SneakyThrow; @@ -587,6 +588,17 @@ public final class Parcel { return parcel; } + @NeverInline + private void errorUsedWhileRecycling() { + Log.wtf(TAG, "Parcel used while recycled. " + + Log.getStackTraceString(new Throwable()) + + " Original recycle call (if DEBUG_RECYCLE): ", mStack); + } + + private void assertNotRecycled() { + if (mRecycled) errorUsedWhileRecycling(); + } + /** * Put a Parcel object back into the pool. You must not touch * the object after this call. @@ -635,6 +647,7 @@ public final class Parcel { * @hide */ public void setReadWriteHelper(@Nullable ReadWriteHelper helper) { + assertNotRecycled(); mReadWriteHelper = helper != null ? helper : ReadWriteHelper.DEFAULT; } @@ -644,6 +657,7 @@ public final class Parcel { * @hide */ public boolean hasReadWriteHelper() { + assertNotRecycled(); return (mReadWriteHelper != null) && (mReadWriteHelper != ReadWriteHelper.DEFAULT); } @@ -670,6 +684,7 @@ public final class Parcel { * @hide */ public final void markSensitive() { + assertNotRecycled(); nativeMarkSensitive(mNativePtr); } @@ -686,6 +701,7 @@ public final class Parcel { * @hide */ public final boolean isForRpc() { + assertNotRecycled(); return nativeIsForRpc(mNativePtr); } @@ -693,21 +709,25 @@ public final class Parcel { @ParcelFlags @TestApi public int getFlags() { + assertNotRecycled(); return mFlags; } /** @hide */ public void setFlags(@ParcelFlags int flags) { + assertNotRecycled(); mFlags = flags; } /** @hide */ public void addFlags(@ParcelFlags int flags) { + assertNotRecycled(); mFlags |= flags; } /** @hide */ private boolean hasFlags(@ParcelFlags int flags) { + assertNotRecycled(); return (mFlags & flags) == flags; } @@ -720,6 +740,7 @@ public final class Parcel { // We don't really need to protect it; even if 3p / non-system apps, nothing would happen. // This would only work when used on a reply parcel by a binder object that's allowed-blocking. public void setPropagateAllowBlocking() { + assertNotRecycled(); addFlags(FLAG_PROPAGATE_ALLOW_BLOCKING); } @@ -727,6 +748,7 @@ public final class Parcel { * Returns the total amount of data contained in the parcel. */ public int dataSize() { + assertNotRecycled(); return nativeDataSize(mNativePtr); } @@ -735,6 +757,7 @@ public final class Parcel { * parcel. That is, {@link #dataSize}-{@link #dataPosition}. */ public final int dataAvail() { + assertNotRecycled(); return nativeDataAvail(mNativePtr); } @@ -743,6 +766,7 @@ public final class Parcel { * more than {@link #dataSize}. */ public final int dataPosition() { + assertNotRecycled(); return nativeDataPosition(mNativePtr); } @@ -753,6 +777,7 @@ public final class Parcel { * data buffer. */ public final int dataCapacity() { + assertNotRecycled(); return nativeDataCapacity(mNativePtr); } @@ -764,6 +789,7 @@ public final class Parcel { * @param size The new number of bytes in the Parcel. */ public final void setDataSize(int size) { + assertNotRecycled(); nativeSetDataSize(mNativePtr, size); } @@ -773,6 +799,7 @@ public final class Parcel { * {@link #dataSize}. */ public final void setDataPosition(int pos) { + assertNotRecycled(); nativeSetDataPosition(mNativePtr, pos); } @@ -784,11 +811,13 @@ public final class Parcel { * with this method. */ public final void setDataCapacity(int size) { + assertNotRecycled(); nativeSetDataCapacity(mNativePtr, size); } /** @hide */ public final boolean pushAllowFds(boolean allowFds) { + assertNotRecycled(); return nativePushAllowFds(mNativePtr, allowFds); } @@ -809,6 +838,7 @@ public final class Parcel { * in different versions of the platform. */ public final byte[] marshall() { + assertNotRecycled(); return nativeMarshall(mNativePtr); } @@ -816,15 +846,18 @@ public final class Parcel { * Fills the raw bytes of this Parcel with the supplied data. */ public final void unmarshall(@NonNull byte[] data, int offset, int length) { + assertNotRecycled(); nativeUnmarshall(mNativePtr, data, offset, length); } public final void appendFrom(Parcel parcel, int offset, int length) { + assertNotRecycled(); nativeAppendFrom(mNativePtr, parcel.mNativePtr, offset, length); } /** @hide */ public int compareData(Parcel other) { + assertNotRecycled(); return nativeCompareData(mNativePtr, other.mNativePtr); } @@ -835,6 +868,7 @@ public final class Parcel { /** @hide */ public final void setClassCookie(Class clz, Object cookie) { + assertNotRecycled(); if (mClassCookies == null) { mClassCookies = new ArrayMap<>(); } @@ -844,11 +878,13 @@ public final class Parcel { /** @hide */ @Nullable public final Object getClassCookie(Class clz) { + assertNotRecycled(); return mClassCookies != null ? mClassCookies.get(clz) : null; } /** @hide */ public void removeClassCookie(Class clz, Object expectedCookie) { + assertNotRecycled(); if (mClassCookies != null) { Object removedCookie = mClassCookies.remove(clz); if (removedCookie != expectedCookie) { @@ -866,21 +902,25 @@ public final class Parcel { * @hide */ public boolean hasClassCookie(Class clz) { + assertNotRecycled(); return mClassCookies != null && mClassCookies.containsKey(clz); } /** @hide */ public final void adoptClassCookies(Parcel from) { + assertNotRecycled(); mClassCookies = from.mClassCookies; } /** @hide */ public Map<Class, Object> copyClassCookies() { + assertNotRecycled(); return new ArrayMap<>(mClassCookies); } /** @hide */ public void putClassCookies(Map<Class, Object> cookies) { + assertNotRecycled(); if (cookies == null) { return; } @@ -894,6 +934,7 @@ public final class Parcel { * Report whether the parcel contains any marshalled file descriptors. */ public boolean hasFileDescriptors() { + assertNotRecycled(); return nativeHasFileDescriptors(mNativePtr); } @@ -909,6 +950,7 @@ public final class Parcel { * @throws IllegalArgumentException if the parameters are out of the permitted ranges. */ public boolean hasFileDescriptors(int offset, int length) { + assertNotRecycled(); return nativeHasFileDescriptorsInRange(mNativePtr, offset, length); } @@ -993,6 +1035,7 @@ public final class Parcel { * @hide */ public boolean hasBinders() { + assertNotRecycled(); return nativeHasBinders(mNativePtr); } @@ -1010,6 +1053,7 @@ public final class Parcel { * @hide */ public boolean hasBinders(int offset, int length) { + assertNotRecycled(); return nativeHasBindersInRange(mNativePtr, offset, length); } @@ -1020,6 +1064,7 @@ public final class Parcel { * at the beginning of transactions as a header. */ public final void writeInterfaceToken(@NonNull String interfaceName) { + assertNotRecycled(); nativeWriteInterfaceToken(mNativePtr, interfaceName); } @@ -1030,6 +1075,7 @@ public final class Parcel { * should propagate to the caller. */ public final void enforceInterface(@NonNull String interfaceName) { + assertNotRecycled(); nativeEnforceInterface(mNativePtr, interfaceName); } @@ -1040,6 +1086,7 @@ public final class Parcel { * When used over binder, this exception should propagate to the caller. */ public void enforceNoDataAvail() { + assertNotRecycled(); final int n = dataAvail(); if (n > 0) { throw new BadParcelableException("Parcel data not fully consumed, unread size: " + n); @@ -1056,6 +1103,7 @@ public final class Parcel { * @hide */ public boolean replaceCallingWorkSourceUid(int workSourceUid) { + assertNotRecycled(); return nativeReplaceCallingWorkSourceUid(mNativePtr, workSourceUid); } @@ -1072,6 +1120,7 @@ public final class Parcel { * @hide */ public int readCallingWorkSourceUid() { + assertNotRecycled(); return nativeReadCallingWorkSourceUid(mNativePtr); } @@ -1081,6 +1130,7 @@ public final class Parcel { * @param b Bytes to place into the parcel. */ public final void writeByteArray(@Nullable byte[] b) { + assertNotRecycled(); writeByteArray(b, 0, (b != null) ? b.length : 0); } @@ -1092,6 +1142,7 @@ public final class Parcel { * @param len Number of bytes to write. */ public final void writeByteArray(@Nullable byte[] b, int offset, int len) { + assertNotRecycled(); if (b == null) { writeInt(-1); return; @@ -1113,6 +1164,7 @@ public final class Parcel { * @see #readBlob() */ public final void writeBlob(@Nullable byte[] b) { + assertNotRecycled(); writeBlob(b, 0, (b != null) ? b.length : 0); } @@ -1131,6 +1183,7 @@ public final class Parcel { * @see #readBlob() */ public final void writeBlob(@Nullable byte[] b, int offset, int len) { + assertNotRecycled(); if (b == null) { writeInt(-1); return; @@ -1149,6 +1202,7 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writeInt(int val) { + assertNotRecycled(); int err = nativeWriteInt(mNativePtr, val); if (err != OK) { nativeSignalExceptionForError(err); @@ -1160,6 +1214,7 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writeLong(long val) { + assertNotRecycled(); int err = nativeWriteLong(mNativePtr, val); if (err != OK) { nativeSignalExceptionForError(err); @@ -1171,6 +1226,7 @@ public final class Parcel { * dataPosition(), growing dataCapacity() if needed. */ public final void writeFloat(float val) { + assertNotRecycled(); int err = nativeWriteFloat(mNativePtr, val); if (err != OK) { nativeSignalExceptionForError(err); @@ -1182,6 +1238,7 @@ public final class Parcel { * current dataPosition(), growing dataCapacity() if needed. */ public final void writeDouble(double val) { + assertNotRecycled(); int err = nativeWriteDouble(mNativePtr, val); if (err != OK) { nativeSignalExceptionForError(err); @@ -1193,16 +1250,19 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writeString(@Nullable String val) { + assertNotRecycled(); writeString16(val); } /** {@hide} */ public final void writeString8(@Nullable String val) { + assertNotRecycled(); mReadWriteHelper.writeString8(this, val); } /** {@hide} */ public final void writeString16(@Nullable String val) { + assertNotRecycled(); mReadWriteHelper.writeString16(this, val); } @@ -1214,16 +1274,19 @@ public final class Parcel { * @hide */ public void writeStringNoHelper(@Nullable String val) { + assertNotRecycled(); writeString16NoHelper(val); } /** {@hide} */ public void writeString8NoHelper(@Nullable String val) { + assertNotRecycled(); nativeWriteString8(mNativePtr, val); } /** {@hide} */ public void writeString16NoHelper(@Nullable String val) { + assertNotRecycled(); nativeWriteString16(mNativePtr, val); } @@ -1235,6 +1298,7 @@ public final class Parcel { * for true or false, respectively, but may change in the future. */ public final void writeBoolean(boolean val) { + assertNotRecycled(); writeInt(val ? 1 : 0); } @@ -1246,6 +1310,7 @@ public final class Parcel { @UnsupportedAppUsage @RavenwoodThrow(blockedBy = android.text.Spanned.class) public final void writeCharSequence(@Nullable CharSequence val) { + assertNotRecycled(); TextUtils.writeToParcel(val, this, 0); } @@ -1254,6 +1319,7 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writeStrongBinder(IBinder val) { + assertNotRecycled(); nativeWriteStrongBinder(mNativePtr, val); } @@ -1262,6 +1328,7 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writeStrongInterface(IInterface val) { + assertNotRecycled(); writeStrongBinder(val == null ? null : val.asBinder()); } @@ -1276,6 +1343,7 @@ public final class Parcel { * if {@link Parcelable#PARCELABLE_WRITE_RETURN_VALUE} is set.</p> */ public final void writeFileDescriptor(@NonNull FileDescriptor val) { + assertNotRecycled(); nativeWriteFileDescriptor(mNativePtr, val); } @@ -1284,6 +1352,7 @@ public final class Parcel { * This will be the new name for writeFileDescriptor, for consistency. **/ public final void writeRawFileDescriptor(@NonNull FileDescriptor val) { + assertNotRecycled(); nativeWriteFileDescriptor(mNativePtr, val); } @@ -1294,6 +1363,7 @@ public final class Parcel { * @param value The array of objects to be written. */ public final void writeRawFileDescriptorArray(@Nullable FileDescriptor[] value) { + assertNotRecycled(); if (value != null) { int N = value.length; writeInt(N); @@ -1313,6 +1383,7 @@ public final class Parcel { * the future. */ public final void writeByte(byte val) { + assertNotRecycled(); writeInt(val); } @@ -1328,6 +1399,7 @@ public final class Parcel { * allows you to avoid mysterious type errors at the point of marshalling. */ public final void writeMap(@Nullable Map val) { + assertNotRecycled(); writeMapInternal((Map<String, Object>) val); } @@ -1336,6 +1408,7 @@ public final class Parcel { * growing dataCapacity() if needed. The Map keys must be String objects. */ /* package */ void writeMapInternal(@Nullable Map<String,Object> val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1361,6 +1434,7 @@ public final class Parcel { * growing dataCapacity() if needed. The Map keys must be String objects. */ /* package */ void writeArrayMapInternal(@Nullable ArrayMap<String, Object> val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1390,6 +1464,7 @@ public final class Parcel { */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void writeArrayMap(@Nullable ArrayMap<String, Object> val) { + assertNotRecycled(); writeArrayMapInternal(val); } @@ -1408,6 +1483,7 @@ public final class Parcel { */ public <T extends Parcelable> void writeTypedArrayMap(@Nullable ArrayMap<String, T> val, int parcelableFlags) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1429,6 +1505,7 @@ public final class Parcel { */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void writeArraySet(@Nullable ArraySet<? extends Object> val) { + assertNotRecycled(); final int size = (val != null) ? val.size() : -1; writeInt(size); for (int i = 0; i < size; i++) { @@ -1441,6 +1518,7 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writeBundle(@Nullable Bundle val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1454,6 +1532,7 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writePersistableBundle(@Nullable PersistableBundle val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1467,6 +1546,7 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writeSize(@NonNull Size val) { + assertNotRecycled(); writeInt(val.getWidth()); writeInt(val.getHeight()); } @@ -1476,6 +1556,7 @@ public final class Parcel { * growing dataCapacity() if needed. */ public final void writeSizeF(@NonNull SizeF val) { + assertNotRecycled(); writeFloat(val.getWidth()); writeFloat(val.getHeight()); } @@ -1486,6 +1567,7 @@ public final class Parcel { * {@link #writeValue} and must follow the specification there. */ public final void writeList(@Nullable List val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1505,6 +1587,7 @@ public final class Parcel { * {@link #writeValue} and must follow the specification there. */ public final void writeArray(@Nullable Object[] val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1525,6 +1608,7 @@ public final class Parcel { * specification there. */ public final <T> void writeSparseArray(@Nullable SparseArray<T> val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1540,6 +1624,7 @@ public final class Parcel { } public final void writeSparseBooleanArray(@Nullable SparseBooleanArray val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1558,6 +1643,7 @@ public final class Parcel { * @hide */ public final void writeSparseIntArray(@Nullable SparseIntArray val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -1573,6 +1659,7 @@ public final class Parcel { } public final void writeBooleanArray(@Nullable boolean[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -1607,6 +1694,7 @@ public final class Parcel { } private void ensureWithinMemoryLimit(int typeSize, @NonNull int... dimensions) { + assertNotRecycled(); // For Multidimensional arrays, Calculate total object // which will be allocated. int totalObjects = 1; @@ -1624,6 +1712,7 @@ public final class Parcel { } private void ensureWithinMemoryLimit(int typeSize, int length) { + assertNotRecycled(); int estimatedAllocationSize = 0; try { estimatedAllocationSize = Math.multiplyExact(typeSize, length); @@ -1647,6 +1736,7 @@ public final class Parcel { @Nullable public final boolean[] createBooleanArray() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_BOOLEAN, N); // >>2 as a fast divide-by-4 works in the create*Array() functions @@ -1664,6 +1754,7 @@ public final class Parcel { } public final void readBooleanArray(@NonNull boolean[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -1676,6 +1767,7 @@ public final class Parcel { /** @hide */ public void writeShortArray(@Nullable short[] val) { + assertNotRecycled(); if (val != null) { int n = val.length; writeInt(n); @@ -1690,6 +1782,7 @@ public final class Parcel { /** @hide */ @Nullable public short[] createShortArray() { + assertNotRecycled(); int n = readInt(); ensureWithinMemoryLimit(SIZE_SHORT, n); if (n >= 0 && n <= (dataAvail() >> 2)) { @@ -1705,6 +1798,7 @@ public final class Parcel { /** @hide */ public void readShortArray(@NonNull short[] val) { + assertNotRecycled(); int n = readInt(); if (n == val.length) { for (int i = 0; i < n; i++) { @@ -1716,6 +1810,7 @@ public final class Parcel { } public final void writeCharArray(@Nullable char[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -1729,6 +1824,7 @@ public final class Parcel { @Nullable public final char[] createCharArray() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_CHAR, N); if (N >= 0 && N <= (dataAvail() >> 2)) { @@ -1743,6 +1839,7 @@ public final class Parcel { } public final void readCharArray(@NonNull char[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -1754,6 +1851,7 @@ public final class Parcel { } public final void writeIntArray(@Nullable int[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -1767,6 +1865,7 @@ public final class Parcel { @Nullable public final int[] createIntArray() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_INT, N); if (N >= 0 && N <= (dataAvail() >> 2)) { @@ -1781,6 +1880,7 @@ public final class Parcel { } public final void readIntArray(@NonNull int[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -1792,6 +1892,7 @@ public final class Parcel { } public final void writeLongArray(@Nullable long[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -1805,6 +1906,7 @@ public final class Parcel { @Nullable public final long[] createLongArray() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_LONG, N); // >>3 because stored longs are 64 bits @@ -1820,6 +1922,7 @@ public final class Parcel { } public final void readLongArray(@NonNull long[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -1831,6 +1934,7 @@ public final class Parcel { } public final void writeFloatArray(@Nullable float[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -1844,6 +1948,7 @@ public final class Parcel { @Nullable public final float[] createFloatArray() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_FLOAT, N); // >>2 because stored floats are 4 bytes @@ -1859,6 +1964,7 @@ public final class Parcel { } public final void readFloatArray(@NonNull float[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -1870,6 +1976,7 @@ public final class Parcel { } public final void writeDoubleArray(@Nullable double[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -1883,6 +1990,7 @@ public final class Parcel { @Nullable public final double[] createDoubleArray() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_DOUBLE, N); // >>3 because stored doubles are 8 bytes @@ -1898,6 +2006,7 @@ public final class Parcel { } public final void readDoubleArray(@NonNull double[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -1909,20 +2018,24 @@ public final class Parcel { } public final void writeStringArray(@Nullable String[] val) { + assertNotRecycled(); writeString16Array(val); } @Nullable public final String[] createStringArray() { + assertNotRecycled(); return createString16Array(); } public final void readStringArray(@NonNull String[] val) { + assertNotRecycled(); readString16Array(val); } /** {@hide} */ public final void writeString8Array(@Nullable String[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -1937,6 +2050,7 @@ public final class Parcel { /** {@hide} */ @Nullable public final String[] createString8Array() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_COMPLEX_TYPE, N); if (N >= 0) { @@ -1952,6 +2066,7 @@ public final class Parcel { /** {@hide} */ public final void readString8Array(@NonNull String[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -1964,6 +2079,7 @@ public final class Parcel { /** {@hide} */ public final void writeString16Array(@Nullable String[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -1978,6 +2094,7 @@ public final class Parcel { /** {@hide} */ @Nullable public final String[] createString16Array() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_COMPLEX_TYPE, N); if (N >= 0) { @@ -1993,6 +2110,7 @@ public final class Parcel { /** {@hide} */ public final void readString16Array(@NonNull String[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -2004,6 +2122,7 @@ public final class Parcel { } public final void writeBinderArray(@Nullable IBinder[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -2028,6 +2147,7 @@ public final class Parcel { */ public final <T extends IInterface> void writeInterfaceArray( @SuppressLint("ArrayReturn") @Nullable T[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -2043,6 +2163,7 @@ public final class Parcel { * @hide */ public final void writeCharSequenceArray(@Nullable CharSequence[] val) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -2058,6 +2179,7 @@ public final class Parcel { * @hide */ public final void writeCharSequenceList(@Nullable ArrayList<CharSequence> val) { + assertNotRecycled(); if (val != null) { int N = val.size(); writeInt(N); @@ -2071,6 +2193,7 @@ public final class Parcel { @Nullable public final IBinder[] createBinderArray() { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_COMPLEX_TYPE, N); if (N >= 0) { @@ -2085,6 +2208,7 @@ public final class Parcel { } public final void readBinderArray(@NonNull IBinder[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -2106,6 +2230,7 @@ public final class Parcel { @Nullable public final <T extends IInterface> T[] createInterfaceArray( @NonNull IntFunction<T[]> newArray, @NonNull Function<IBinder, T> asInterface) { + assertNotRecycled(); int N = readInt(); ensureWithinMemoryLimit(SIZE_COMPLEX_TYPE, N); if (N >= 0) { @@ -2130,6 +2255,7 @@ public final class Parcel { public final <T extends IInterface> void readInterfaceArray( @SuppressLint("ArrayReturn") @NonNull T[] val, @NonNull Function<IBinder, T> asInterface) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -2155,6 +2281,7 @@ public final class Parcel { * @see Parcelable */ public final <T extends Parcelable> void writeTypedList(@Nullable List<T> val) { + assertNotRecycled(); writeTypedList(val, 0); } @@ -2174,6 +2301,7 @@ public final class Parcel { */ public final <T extends Parcelable> void writeTypedSparseArray(@Nullable SparseArray<T> val, int parcelableFlags) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -2203,6 +2331,7 @@ public final class Parcel { * @see Parcelable */ public <T extends Parcelable> void writeTypedList(@Nullable List<T> val, int parcelableFlags) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -2228,6 +2357,7 @@ public final class Parcel { * @see #readStringList */ public final void writeStringList(@Nullable List<String> val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -2253,6 +2383,7 @@ public final class Parcel { * @see #readBinderList */ public final void writeBinderList(@Nullable List<IBinder> val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -2275,6 +2406,7 @@ public final class Parcel { * @see #readInterfaceList */ public final <T extends IInterface> void writeInterfaceList(@Nullable List<T> val) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -2296,6 +2428,7 @@ public final class Parcel { * @see #readParcelableList(List, ClassLoader) */ public final <T extends Parcelable> void writeParcelableList(@Nullable List<T> val, int flags) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -2330,6 +2463,7 @@ public final class Parcel { */ public final <T extends Parcelable> void writeTypedArray(@Nullable T[] val, int parcelableFlags) { + assertNotRecycled(); if (val != null) { int N = val.length; writeInt(N); @@ -2352,6 +2486,7 @@ public final class Parcel { */ public final <T extends Parcelable> void writeTypedObject(@Nullable T val, int parcelableFlags) { + assertNotRecycled(); if (val != null) { writeInt(1); val.writeToParcel(this, parcelableFlags); @@ -2389,6 +2524,7 @@ public final class Parcel { */ public <T> void writeFixedArray(@Nullable T val, int parcelableFlags, @NonNull int... dimensions) { + assertNotRecycled(); if (val == null) { writeInt(-1); return; @@ -2500,6 +2636,7 @@ public final class Parcel { * should be used).</p> */ public final void writeValue(@Nullable Object v) { + assertNotRecycled(); if (v instanceof LazyValue) { LazyValue value = (LazyValue) v; value.writeToParcel(this); @@ -2617,6 +2754,7 @@ public final class Parcel { * @hide */ public void writeValue(int type, @Nullable Object v) { + assertNotRecycled(); switch (type) { case VAL_NULL: break; @@ -2730,6 +2868,7 @@ public final class Parcel { * {@link Parcelable#writeToParcel(Parcel, int) Parcelable.writeToParcel()}. */ public final void writeParcelable(@Nullable Parcelable p, int parcelableFlags) { + assertNotRecycled(); if (p == null) { writeString(null); return; @@ -2745,6 +2884,7 @@ public final class Parcel { * @see #readParcelableCreator */ public final void writeParcelableCreator(@NonNull Parcelable p) { + assertNotRecycled(); String name = p.getClass().getName(); writeString(name); } @@ -2783,6 +2923,7 @@ public final class Parcel { */ @TestApi public boolean allowSquashing() { + assertNotRecycled(); boolean previous = mAllowSquashing; mAllowSquashing = true; return previous; @@ -2794,6 +2935,7 @@ public final class Parcel { */ @TestApi public void restoreAllowSquashing(boolean previous) { + assertNotRecycled(); mAllowSquashing = previous; if (!mAllowSquashing) { mWrittenSquashableParcelables = null; @@ -2850,6 +2992,7 @@ public final class Parcel { * @hide */ public boolean maybeWriteSquashed(@NonNull Parcelable p) { + assertNotRecycled(); if (!mAllowSquashing) { // Don't squash, and don't put it in the map either. writeInt(0); @@ -2900,6 +3043,7 @@ public final class Parcel { @SuppressWarnings("unchecked") @Nullable public <T extends Parcelable> T readSquashed(SquashReadHelper<T> reader) { + assertNotRecycled(); final int offset = readInt(); final int pos = dataPosition(); @@ -2933,6 +3077,7 @@ public final class Parcel { * using the other approaches to writing data in to a Parcel. */ public final void writeSerializable(@Nullable Serializable s) { + assertNotRecycled(); if (s == null) { writeString(null); return; @@ -2985,6 +3130,7 @@ public final class Parcel { */ @RavenwoodReplace(blockedBy = AppOpsManager.class) public final void writeException(@NonNull Exception e) { + assertNotRecycled(); AppOpsManager.prefixParcelWithAppOpsIfNeeded(this); int code = getExceptionCode(e); @@ -3065,6 +3211,7 @@ public final class Parcel { /** @hide */ public void writeStackTrace(@NonNull Throwable e) { + assertNotRecycled(); final int sizePosition = dataPosition(); writeInt(0); // Header size will be filled in later StackTraceElement[] stackTrace = e.getStackTrace(); @@ -3090,6 +3237,7 @@ public final class Parcel { */ @RavenwoodReplace(blockedBy = AppOpsManager.class) public final void writeNoException() { + assertNotRecycled(); AppOpsManager.prefixParcelWithAppOpsIfNeeded(this); // Despite the name of this function ("write no exception"), @@ -3133,6 +3281,7 @@ public final class Parcel { * @see #writeNoException */ public final void readException() { + assertNotRecycled(); int code = readExceptionCode(); if (code != 0) { String msg = readString(); @@ -3156,6 +3305,7 @@ public final class Parcel { @UnsupportedAppUsage @TestApi public final int readExceptionCode() { + assertNotRecycled(); int code = readInt(); if (code == EX_HAS_NOTED_APPOPS_REPLY_HEADER) { AppOpsManager.readAndLogNotedAppops(this); @@ -3189,6 +3339,7 @@ public final class Parcel { * @param msg The exception message. */ public final void readException(int code, String msg) { + assertNotRecycled(); String remoteStackTrace = null; final int remoteStackPayloadSize = readInt(); if (remoteStackPayloadSize > 0) { @@ -3219,6 +3370,7 @@ public final class Parcel { /** @hide */ public Exception createExceptionOrNull(int code, String msg) { + assertNotRecycled(); switch (code) { case EX_PARCELABLE: if (readInt() > 0) { @@ -3251,6 +3403,7 @@ public final class Parcel { * Read an integer value from the parcel at the current dataPosition(). */ public final int readInt() { + assertNotRecycled(); return nativeReadInt(mNativePtr); } @@ -3258,6 +3411,7 @@ public final class Parcel { * Read a long integer value from the parcel at the current dataPosition(). */ public final long readLong() { + assertNotRecycled(); return nativeReadLong(mNativePtr); } @@ -3266,6 +3420,7 @@ public final class Parcel { * dataPosition(). */ public final float readFloat() { + assertNotRecycled(); return nativeReadFloat(mNativePtr); } @@ -3274,6 +3429,7 @@ public final class Parcel { * current dataPosition(). */ public final double readDouble() { + assertNotRecycled(); return nativeReadDouble(mNativePtr); } @@ -3282,16 +3438,19 @@ public final class Parcel { */ @Nullable public final String readString() { + assertNotRecycled(); return readString16(); } /** {@hide} */ public final @Nullable String readString8() { + assertNotRecycled(); return mReadWriteHelper.readString8(this); } /** {@hide} */ public final @Nullable String readString16() { + assertNotRecycled(); return mReadWriteHelper.readString16(this); } @@ -3303,16 +3462,19 @@ public final class Parcel { * @hide */ public @Nullable String readStringNoHelper() { + assertNotRecycled(); return readString16NoHelper(); } /** {@hide} */ public @Nullable String readString8NoHelper() { + assertNotRecycled(); return nativeReadString8(mNativePtr); } /** {@hide} */ public @Nullable String readString16NoHelper() { + assertNotRecycled(); return nativeReadString16(mNativePtr); } @@ -3320,6 +3482,7 @@ public final class Parcel { * Read a boolean value from the parcel at the current dataPosition(). */ public final boolean readBoolean() { + assertNotRecycled(); return readInt() != 0; } @@ -3330,6 +3493,7 @@ public final class Parcel { @UnsupportedAppUsage @Nullable public final CharSequence readCharSequence() { + assertNotRecycled(); return TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(this); } @@ -3337,6 +3501,7 @@ public final class Parcel { * Read an object from the parcel at the current dataPosition(). */ public final IBinder readStrongBinder() { + assertNotRecycled(); final IBinder result = nativeReadStrongBinder(mNativePtr); // If it's a reply from a method with @PropagateAllowBlocking, then inherit allow-blocking @@ -3352,6 +3517,7 @@ public final class Parcel { * Read a FileDescriptor from the parcel at the current dataPosition(). */ public final ParcelFileDescriptor readFileDescriptor() { + assertNotRecycled(); FileDescriptor fd = nativeReadFileDescriptor(mNativePtr); return fd != null ? new ParcelFileDescriptor(fd) : null; } @@ -3359,6 +3525,7 @@ public final class Parcel { /** {@hide} */ @UnsupportedAppUsage public final FileDescriptor readRawFileDescriptor() { + assertNotRecycled(); return nativeReadFileDescriptor(mNativePtr); } @@ -3369,6 +3536,7 @@ public final class Parcel { **/ @Nullable public final FileDescriptor[] createRawFileDescriptorArray() { + assertNotRecycled(); int N = readInt(); if (N < 0) { return null; @@ -3388,6 +3556,7 @@ public final class Parcel { * @return the FileDescriptor array, or null if the array is null. **/ public final void readRawFileDescriptorArray(FileDescriptor[] val) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -3402,6 +3571,7 @@ public final class Parcel { * Read a byte value from the parcel at the current dataPosition(). */ public final byte readByte() { + assertNotRecycled(); return (byte)(readInt() & 0xff); } @@ -3416,6 +3586,7 @@ public final class Parcel { */ @Deprecated public final void readMap(@NonNull Map outVal, @Nullable ClassLoader loader) { + assertNotRecycled(); readMapInternal(outVal, loader, /* clazzKey */ null, /* clazzValue */ null); } @@ -3429,6 +3600,7 @@ public final class Parcel { public <K, V> void readMap(@NonNull Map<? super K, ? super V> outVal, @Nullable ClassLoader loader, @NonNull Class<K> clazzKey, @NonNull Class<V> clazzValue) { + assertNotRecycled(); Objects.requireNonNull(clazzKey); Objects.requireNonNull(clazzValue); readMapInternal(outVal, loader, clazzKey, clazzValue); @@ -3447,6 +3619,7 @@ public final class Parcel { */ @Deprecated public final void readList(@NonNull List outVal, @Nullable ClassLoader loader) { + assertNotRecycled(); int N = readInt(); readListInternal(outVal, N, loader, /* clazz */ null); } @@ -3468,6 +3641,7 @@ public final class Parcel { */ public <T> void readList(@NonNull List<? super T> outVal, @Nullable ClassLoader loader, @NonNull Class<T> clazz) { + assertNotRecycled(); Objects.requireNonNull(clazz); int n = readInt(); readListInternal(outVal, n, loader, clazz); @@ -3487,6 +3661,7 @@ public final class Parcel { @Deprecated @Nullable public HashMap readHashMap(@Nullable ClassLoader loader) { + assertNotRecycled(); return readHashMapInternal(loader, /* clazzKey */ null, /* clazzValue */ null); } @@ -3501,6 +3676,7 @@ public final class Parcel { @Nullable public <K, V> HashMap<K, V> readHashMap(@Nullable ClassLoader loader, @NonNull Class<? extends K> clazzKey, @NonNull Class<? extends V> clazzValue) { + assertNotRecycled(); Objects.requireNonNull(clazzKey); Objects.requireNonNull(clazzValue); return readHashMapInternal(loader, clazzKey, clazzValue); @@ -3513,6 +3689,7 @@ public final class Parcel { */ @Nullable public final Bundle readBundle() { + assertNotRecycled(); return readBundle(null); } @@ -3524,6 +3701,7 @@ public final class Parcel { */ @Nullable public final Bundle readBundle(@Nullable ClassLoader loader) { + assertNotRecycled(); int length = readInt(); if (length < 0) { if (Bundle.DEBUG) Log.d(TAG, "null bundle: length=" + length); @@ -3544,6 +3722,7 @@ public final class Parcel { */ @Nullable public final PersistableBundle readPersistableBundle() { + assertNotRecycled(); return readPersistableBundle(null); } @@ -3555,6 +3734,7 @@ public final class Parcel { */ @Nullable public final PersistableBundle readPersistableBundle(@Nullable ClassLoader loader) { + assertNotRecycled(); int length = readInt(); if (length < 0) { if (Bundle.DEBUG) Log.d(TAG, "null bundle: length=" + length); @@ -3573,6 +3753,7 @@ public final class Parcel { */ @NonNull public final Size readSize() { + assertNotRecycled(); final int width = readInt(); final int height = readInt(); return new Size(width, height); @@ -3583,6 +3764,7 @@ public final class Parcel { */ @NonNull public final SizeF readSizeF() { + assertNotRecycled(); final float width = readFloat(); final float height = readFloat(); return new SizeF(width, height); @@ -3593,6 +3775,7 @@ public final class Parcel { */ @Nullable public final byte[] createByteArray() { + assertNotRecycled(); return nativeCreateByteArray(mNativePtr); } @@ -3601,6 +3784,7 @@ public final class Parcel { * given byte array. */ public final void readByteArray(@NonNull byte[] val) { + assertNotRecycled(); boolean valid = nativeReadByteArray(mNativePtr, val, (val != null) ? val.length : 0); if (!valid) { throw new RuntimeException("bad array lengths"); @@ -3613,6 +3797,7 @@ public final class Parcel { */ @Nullable public final byte[] readBlob() { + assertNotRecycled(); return nativeReadBlob(mNativePtr); } @@ -3623,6 +3808,7 @@ public final class Parcel { @UnsupportedAppUsage @Nullable public final String[] readStringArray() { + assertNotRecycled(); return createString16Array(); } @@ -3632,6 +3818,7 @@ public final class Parcel { */ @Nullable public final CharSequence[] readCharSequenceArray() { + assertNotRecycled(); CharSequence[] array = null; int length = readInt(); @@ -3654,6 +3841,7 @@ public final class Parcel { */ @Nullable public final ArrayList<CharSequence> readCharSequenceList() { + assertNotRecycled(); ArrayList<CharSequence> array = null; int length = readInt(); @@ -3683,6 +3871,7 @@ public final class Parcel { @Deprecated @Nullable public ArrayList readArrayList(@Nullable ClassLoader loader) { + assertNotRecycled(); return readArrayListInternal(loader, /* clazz */ null); } @@ -3705,6 +3894,7 @@ public final class Parcel { @Nullable public <T> ArrayList<T> readArrayList(@Nullable ClassLoader loader, @NonNull Class<? extends T> clazz) { + assertNotRecycled(); Objects.requireNonNull(clazz); return readArrayListInternal(loader, clazz); } @@ -3724,6 +3914,7 @@ public final class Parcel { @Deprecated @Nullable public Object[] readArray(@Nullable ClassLoader loader) { + assertNotRecycled(); return readArrayInternal(loader, /* clazz */ null); } @@ -3745,6 +3936,7 @@ public final class Parcel { @SuppressLint({"ArrayReturn", "NullableCollection"}) @Nullable public <T> T[] readArray(@Nullable ClassLoader loader, @NonNull Class<T> clazz) { + assertNotRecycled(); Objects.requireNonNull(clazz); return readArrayInternal(loader, clazz); } @@ -3764,6 +3956,7 @@ public final class Parcel { @Deprecated @Nullable public <T> SparseArray<T> readSparseArray(@Nullable ClassLoader loader) { + assertNotRecycled(); return readSparseArrayInternal(loader, /* clazz */ null); } @@ -3785,6 +3978,7 @@ public final class Parcel { @Nullable public <T> SparseArray<T> readSparseArray(@Nullable ClassLoader loader, @NonNull Class<? extends T> clazz) { + assertNotRecycled(); Objects.requireNonNull(clazz); return readSparseArrayInternal(loader, clazz); } @@ -3796,6 +3990,7 @@ public final class Parcel { */ @Nullable public final SparseBooleanArray readSparseBooleanArray() { + assertNotRecycled(); int N = readInt(); if (N < 0) { return null; @@ -3812,6 +4007,7 @@ public final class Parcel { */ @Nullable public final SparseIntArray readSparseIntArray() { + assertNotRecycled(); int N = readInt(); if (N < 0) { return null; @@ -3836,6 +4032,7 @@ public final class Parcel { */ @Nullable public final <T> ArrayList<T> createTypedArrayList(@NonNull Parcelable.Creator<T> c) { + assertNotRecycled(); int N = readInt(); if (N < 0) { return null; @@ -3859,6 +4056,7 @@ public final class Parcel { * @see #writeTypedList */ public final <T> void readTypedList(@NonNull List<T> list, @NonNull Parcelable.Creator<T> c) { + assertNotRecycled(); int M = list.size(); int N = readInt(); int i = 0; @@ -3888,6 +4086,7 @@ public final class Parcel { */ public final @Nullable <T extends Parcelable> SparseArray<T> createTypedSparseArray( @NonNull Parcelable.Creator<T> creator) { + assertNotRecycled(); final int count = readInt(); if (count < 0) { return null; @@ -3917,6 +4116,7 @@ public final class Parcel { */ public final @Nullable <T extends Parcelable> ArrayMap<String, T> createTypedArrayMap( @NonNull Parcelable.Creator<T> creator) { + assertNotRecycled(); final int count = readInt(); if (count < 0) { return null; @@ -3944,6 +4144,7 @@ public final class Parcel { */ @Nullable public final ArrayList<String> createStringArrayList() { + assertNotRecycled(); int N = readInt(); if (N < 0) { return null; @@ -3970,6 +4171,7 @@ public final class Parcel { */ @Nullable public final ArrayList<IBinder> createBinderArrayList() { + assertNotRecycled(); int N = readInt(); if (N < 0) { return null; @@ -3997,6 +4199,7 @@ public final class Parcel { @Nullable public final <T extends IInterface> ArrayList<T> createInterfaceArrayList( @NonNull Function<IBinder, T> asInterface) { + assertNotRecycled(); int N = readInt(); if (N < 0) { return null; @@ -4017,6 +4220,7 @@ public final class Parcel { * @see #writeStringList */ public final void readStringList(@NonNull List<String> list) { + assertNotRecycled(); int M = list.size(); int N = readInt(); int i = 0; @@ -4038,6 +4242,7 @@ public final class Parcel { * @see #writeBinderList */ public final void readBinderList(@NonNull List<IBinder> list) { + assertNotRecycled(); int M = list.size(); int N = readInt(); int i = 0; @@ -4060,6 +4265,7 @@ public final class Parcel { */ public final <T extends IInterface> void readInterfaceList(@NonNull List<T> list, @NonNull Function<IBinder, T> asInterface) { + assertNotRecycled(); int M = list.size(); int N = readInt(); int i = 0; @@ -4091,6 +4297,7 @@ public final class Parcel { @NonNull public final <T extends Parcelable> List<T> readParcelableList(@NonNull List<T> list, @Nullable ClassLoader cl) { + assertNotRecycled(); return readParcelableListInternal(list, cl, /*clazz*/ null); } @@ -4112,6 +4319,7 @@ public final class Parcel { @NonNull public <T> List<T> readParcelableList(@NonNull List<T> list, @Nullable ClassLoader cl, @NonNull Class<? extends T> clazz) { + assertNotRecycled(); Objects.requireNonNull(list); Objects.requireNonNull(clazz); return readParcelableListInternal(list, cl, clazz); @@ -4157,6 +4365,7 @@ public final class Parcel { */ @Nullable public final <T> T[] createTypedArray(@NonNull Parcelable.Creator<T> c) { + assertNotRecycled(); int N = readInt(); if (N < 0) { return null; @@ -4170,6 +4379,7 @@ public final class Parcel { } public final <T> void readTypedArray(@NonNull T[] val, @NonNull Parcelable.Creator<T> c) { + assertNotRecycled(); int N = readInt(); if (N == val.length) { for (int i=0; i<N; i++) { @@ -4186,6 +4396,7 @@ public final class Parcel { */ @Deprecated public final <T> T[] readTypedArray(Parcelable.Creator<T> c) { + assertNotRecycled(); return createTypedArray(c); } @@ -4202,6 +4413,7 @@ public final class Parcel { */ @Nullable public final <T> T readTypedObject(@NonNull Parcelable.Creator<T> c) { + assertNotRecycled(); if (readInt() != 0) { return c.createFromParcel(this); } else { @@ -4228,6 +4440,7 @@ public final class Parcel { * @see #readTypedArray */ public <T> void readFixedArray(@NonNull T val) { + assertNotRecycled(); Class<?> componentType = val.getClass().getComponentType(); if (componentType == boolean.class) { readBooleanArray((boolean[]) val); @@ -4268,6 +4481,7 @@ public final class Parcel { */ public <T, S extends IInterface> void readFixedArray(@NonNull T val, @NonNull Function<IBinder, S> asInterface) { + assertNotRecycled(); Class<?> componentType = val.getClass().getComponentType(); if (IInterface.class.isAssignableFrom(componentType)) { readInterfaceArray((S[]) val, asInterface); @@ -4294,6 +4508,7 @@ public final class Parcel { */ public <T, S extends Parcelable> void readFixedArray(@NonNull T val, @NonNull Parcelable.Creator<S> c) { + assertNotRecycled(); Class<?> componentType = val.getClass().getComponentType(); if (Parcelable.class.isAssignableFrom(componentType)) { readTypedArray((S[]) val, c); @@ -4351,6 +4566,7 @@ public final class Parcel { */ @Nullable public <T> T createFixedArray(@NonNull Class<T> cls, @NonNull int... dimensions) { + assertNotRecycled(); // Check if type matches with dimensions // If type is one-dimensional array, delegate to other creators // Otherwise, create an multi-dimensional array at once and then fill it with readFixedArray @@ -4424,6 +4640,7 @@ public final class Parcel { @Nullable public <T, S extends IInterface> T createFixedArray(@NonNull Class<T> cls, @NonNull Function<IBinder, S> asInterface, @NonNull int... dimensions) { + assertNotRecycled(); // Check if type matches with dimensions // If type is one-dimensional array, delegate to other creators // Otherwise, create an multi-dimensional array at once and then fill it with readFixedArray @@ -4484,6 +4701,7 @@ public final class Parcel { @Nullable public <T, S extends Parcelable> T createFixedArray(@NonNull Class<T> cls, @NonNull Parcelable.Creator<S> c, @NonNull int... dimensions) { + assertNotRecycled(); // Check if type matches with dimensions // If type is one-dimensional array, delegate to other creators // Otherwise, create an multi-dimensional array at once and then fill it with readFixedArray @@ -4547,6 +4765,7 @@ public final class Parcel { */ public final <T extends Parcelable> void writeParcelableArray(@Nullable T[] value, int parcelableFlags) { + assertNotRecycled(); if (value != null) { int N = value.length; writeInt(N); @@ -4565,6 +4784,7 @@ public final class Parcel { */ @Nullable public final Object readValue(@Nullable ClassLoader loader) { + assertNotRecycled(); return readValue(loader, /* clazz */ null); } @@ -4620,6 +4840,7 @@ public final class Parcel { */ @Nullable public Object readLazyValue(@Nullable ClassLoader loader) { + assertNotRecycled(); int start = dataPosition(); int type = readInt(); if (isLengthPrefixed(type)) { @@ -5022,6 +5243,7 @@ public final class Parcel { @Deprecated @Nullable public final <T extends Parcelable> T readParcelable(@Nullable ClassLoader loader) { + assertNotRecycled(); return readParcelableInternal(loader, /* clazz */ null); } @@ -5041,6 +5263,7 @@ public final class Parcel { */ @Nullable public <T> T readParcelable(@Nullable ClassLoader loader, @NonNull Class<T> clazz) { + assertNotRecycled(); Objects.requireNonNull(clazz); return readParcelableInternal(loader, clazz); } @@ -5069,6 +5292,7 @@ public final class Parcel { @Nullable public final <T extends Parcelable> T readCreator(@NonNull Parcelable.Creator<?> creator, @Nullable ClassLoader loader) { + assertNotRecycled(); if (creator instanceof Parcelable.ClassLoaderCreator<?>) { Parcelable.ClassLoaderCreator<?> classLoaderCreator = (Parcelable.ClassLoaderCreator<?>) creator; @@ -5096,6 +5320,7 @@ public final class Parcel { @Deprecated @Nullable public final Parcelable.Creator<?> readParcelableCreator(@Nullable ClassLoader loader) { + assertNotRecycled(); return readParcelableCreatorInternal(loader, /* clazz */ null); } @@ -5116,6 +5341,7 @@ public final class Parcel { @Nullable public <T> Parcelable.Creator<T> readParcelableCreator( @Nullable ClassLoader loader, @NonNull Class<T> clazz) { + assertNotRecycled(); Objects.requireNonNull(clazz); return readParcelableCreatorInternal(loader, clazz); } @@ -5238,6 +5464,7 @@ public final class Parcel { @Deprecated @Nullable public Parcelable[] readParcelableArray(@Nullable ClassLoader loader) { + assertNotRecycled(); return readParcelableArrayInternal(loader, /* clazz */ null); } @@ -5258,6 +5485,7 @@ public final class Parcel { @SuppressLint({"ArrayReturn", "NullableCollection"}) @Nullable public <T> T[] readParcelableArray(@Nullable ClassLoader loader, @NonNull Class<T> clazz) { + assertNotRecycled(); return readParcelableArrayInternal(loader, requireNonNull(clazz)); } @@ -5291,6 +5519,7 @@ public final class Parcel { @Deprecated @Nullable public Serializable readSerializable() { + assertNotRecycled(); return readSerializableInternal(/* loader */ null, /* clazz */ null); } @@ -5307,6 +5536,7 @@ public final class Parcel { */ @Nullable public <T> T readSerializable(@Nullable ClassLoader loader, @NonNull Class<T> clazz) { + assertNotRecycled(); Objects.requireNonNull(clazz); return readSerializableInternal( loader == null ? getClass().getClassLoader() : loader, clazz); @@ -5548,6 +5778,7 @@ public final class Parcel { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public void readArrayMap(@NonNull ArrayMap<? super String, Object> outVal, @Nullable ClassLoader loader) { + assertNotRecycled(); final int N = readInt(); if (N < 0) { return; @@ -5564,6 +5795,7 @@ public final class Parcel { */ @UnsupportedAppUsage public @Nullable ArraySet<? extends Object> readArraySet(@Nullable ClassLoader loader) { + assertNotRecycled(); final int size = readInt(); if (size < 0) { return null; @@ -5703,6 +5935,7 @@ public final class Parcel { * @hide For testing */ public long getOpenAshmemSize() { + assertNotRecycled(); return nativeGetOpenAshmemSize(mNativePtr); } diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 9e7bf47ae83f..cd48f0847f8d 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1266,9 +1266,17 @@ public final class PowerManager { * @hide */ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) - public float getBrightnessConstraint(int constraint) { + public float getBrightnessConstraint(@BrightnessConstraint int constraint) { + return getBrightnessConstraint(Display.DEFAULT_DISPLAY, constraint); + } + + /** + * Gets a float screen brightness setting for a specific display. + * @hide + */ + public float getBrightnessConstraint(int displayId, @BrightnessConstraint int constraint) { try { - return mService.getBrightnessConstraint(constraint); + return mService.getBrightnessConstraint(displayId, constraint); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/os/SELinux.java b/core/java/android/os/SELinux.java index f64a81177ce2..11c54ef802fe 100644 --- a/core/java/android/os/SELinux.java +++ b/core/java/android/os/SELinux.java @@ -193,4 +193,31 @@ public class SELinux { return false; } } + + /** + * Gets the genfs labels version of the vendor. The genfs labels version is + * specified in {@code /vendor/etc/selinux/genfs_labels_version.txt}. The + * version follows the VINTF version format "YYYYMM" and affects how {@code + * genfs_contexts} entries are applied. + * + * <p>The genfs labels version indicates changes in the SELinux labeling + * scheme over time. For example: + * <ul> + * <li>For version 202504 and later, {@code /sys/class/udc} is labeled as + * {@code sysfs_udc}. + * <li>For version 202404 and earlier, {@code /sys/class/udc} is labeled + * as {@code sysfs}. + * </ul> + * Check {@code /system/etc/selinux/plat_sepolicy_genfs_{version}.cil} to + * see which labels are new in {version}. + * + * <p>Older vendors may override {@code genfs_contexts} with vendor-specific + * extensions. The framework must not break such labellings to maintain + * compatibility with such vendors, by checking the genfs labels version and + * implementing a fallback mechanism. + * + * @return an integer representing the genfs labels version of /vendor, in + * the format YYYYMM. + */ + public static final native int getGenfsLabelsVersion(); } diff --git a/core/java/android/os/UpdateEngine.java b/core/java/android/os/UpdateEngine.java index 0a8f62fd56d8..81e4549c78d1 100644 --- a/core/java/android/os/UpdateEngine.java +++ b/core/java/android/os/UpdateEngine.java @@ -16,6 +16,7 @@ package android.os; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; @@ -667,4 +668,23 @@ public class UpdateEngine { throw e.rethrowFromSystemServer(); } } + + /** + * Run postinstall script for specified partition |partition| + * + * @param partition The partition to trigger postinstall runs + * + * @throws ServiceSpecificException error code of this exception would be one of + * https://cs.android.com/android/platform/superproject/main/+/main:system/update_engine/common/error_code.h + * @hide + */ + @FlaggedApi(Flags.FLAG_UPDATE_ENGINE_API) + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + public void triggerPostinstall(@NonNull String partition) { + try { + mUpdateEngine.triggerPostinstall(partition); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } } diff --git a/core/java/android/permission/PermissionManager.java b/core/java/android/permission/PermissionManager.java index e98397d104d6..2473de4ff6d7 100644 --- a/core/java/android/permission/PermissionManager.java +++ b/core/java/android/permission/PermissionManager.java @@ -1795,14 +1795,45 @@ public final class PermissionManager { } } - /** @hide */ - public static final String CACHE_KEY_PACKAGE_INFO = + // The legacy system property "package_info" had two purposes: to invalidate PIC caches and to + // signal that package information, and therefore permissions, might have changed. + // AudioSystem is the only client of the signaling behavior. The "separate permissions + // notification" feature splits the two behaviors into two system property names. + // + // If the feature is disabled (legacy behavior) then the two system property names have the + // same value. This means there is only one system property in use. + // + // If the feature is enabled, then the two system property names have different values, which + // means there is a system property used by PIC and a system property used for signaling. The + // legacy value is hard-coded in native code that relies on the signaling behavior, so the + // system property name for signaling is the legacy property name, and the system property + // name for PIC is new. + private static String getPackageInfoCacheKey() { + if (PropertyInvalidatedCache.separatePermissionNotificationsEnabled()) { + return PropertyInvalidatedCache.createSystemCacheKey("package_info_cache"); + } else { + return CACHE_KEY_PACKAGE_INFO_NOTIFY; + } + } + + /** + * The system property that is used to notify clients that package information, and therefore + * permissions, may have changed. + * @hide + */ + public static final String CACHE_KEY_PACKAGE_INFO_NOTIFY = PropertyInvalidatedCache.createSystemCacheKey("package_info"); + /** + * The system property that is used to invalidate PIC caches. + * @hide + */ + public static final String CACHE_KEY_PACKAGE_INFO_CACHE = getPackageInfoCacheKey(); + /** @hide */ private static final PropertyInvalidatedCache<PermissionQuery, Integer> sPermissionCache = new PropertyInvalidatedCache<PermissionQuery, Integer>( - 2048, CACHE_KEY_PACKAGE_INFO, "checkPermission") { + 2048, CACHE_KEY_PACKAGE_INFO_CACHE, "checkPermission") { @Override public Integer recompute(PermissionQuery query) { return checkPermissionUncached(query.permission, query.pid, query.uid, @@ -1920,7 +1951,7 @@ public final class PermissionManager { private static PropertyInvalidatedCache<PackageNamePermissionQuery, Integer> sPackageNamePermissionCache = new PropertyInvalidatedCache<PackageNamePermissionQuery, Integer>( - 16, CACHE_KEY_PACKAGE_INFO, "checkPackageNamePermission") { + 16, CACHE_KEY_PACKAGE_INFO_CACHE, "checkPackageNamePermission") { @Override public Integer recompute(PackageNamePermissionQuery query) { return checkPackageNamePermissionUncached( diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index c2b8157de416..2c4883f1f61c 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -474,3 +474,21 @@ flag { description: "Enable cross-user roles platform API" bug: "367732307" } + +flag { + name: "rate_limit_batched_note_op_async_callbacks_enabled" + is_fixed_read_only: true + is_exported: true + namespace: "permissions" + description: "Rate limit async noteOp callbacks for batched noteOperation binder call" + bug: "366013082" +} + +flag { + name: "system_vendor_intelligence_role_enabled" + is_exported: true + is_fixed_read_only: true + namespace: "permissions" + description: "This flag is used to enable the role system_vendor_intelligence" + bug: "377553620" +} diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index e4a3c9fa7741..25e8a4ddffcd 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -213,7 +213,10 @@ public abstract class PreferenceActivity extends ListActivity implements private int mPreferenceHeaderItemResId = 0; private boolean mPreferenceHeaderRemoveEmptyIcon = false; + private boolean mIsBackCallbackRegistered = false; private final OnBackInvokedCallback mOnBackInvokedCallback = this::onBackInvoked; + private final FragmentManager.OnBackStackChangedListener mOnBackStackChangedListener = + this::updateBackCallbackRegistrationState; /** * The starting request code given out to preference framework. @@ -706,6 +709,7 @@ public abstract class PreferenceActivity extends ListActivity implements } } updateBackCallbackRegistrationState(); + getFragmentManager().addOnBackStackChangedListener(mOnBackStackChangedListener); } @Override @@ -715,17 +719,25 @@ public abstract class PreferenceActivity extends ListActivity implements private void updateBackCallbackRegistrationState() { if (!WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(this)) return; - if (mCurHeader != null && mSinglePane && getFragmentManager().getBackStackEntryCount() == 0 - && getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT) == null) { - getOnBackInvokedDispatcher() - .registerOnBackInvokedCallback(PRIORITY_DEFAULT, mOnBackInvokedCallback); - } else { + if ((mCurHeader != null && getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT) == null + && mSinglePane) || getFragmentManager().getBackStackEntryCount() != 0) { + if (!mIsBackCallbackRegistered) { + getOnBackInvokedDispatcher() + .registerOnBackInvokedCallback(PRIORITY_DEFAULT, mOnBackInvokedCallback); + mIsBackCallbackRegistered = true; + } + } else if (mIsBackCallbackRegistered) { getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(mOnBackInvokedCallback); + mIsBackCallbackRegistered = false; } } private void onBackInvoked() { - if (mCurHeader != null && mSinglePane && getFragmentManager().getBackStackEntryCount() == 0 + if (WindowOnBackInvokedDispatcher.isOnBackInvokedCallbackEnabled(this) + && getFragmentManager().getBackStackEntryCount() != 0) { + getFragmentManager().popBackStackImmediate(); + } else if (mCurHeader != null && mSinglePane + && getFragmentManager().getBackStackEntryCount() == 0 && getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT) == null) { mCurHeader = null; @@ -1012,6 +1024,7 @@ public abstract class PreferenceActivity extends ListActivity implements @Override protected void onDestroy() { + getFragmentManager().removeOnBackStackChangedListener(mOnBackStackChangedListener); mHandler.removeMessages(MSG_BIND_PREFERENCES); mHandler.removeMessages(MSG_BUILD_HEADERS); super.onDestroy(); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 0ae9ffa655cd..9935be2c8ef6 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2469,6 +2469,25 @@ public final class Settings { = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS"; /** + * Activity Action: Show the settings for users to select their preferred SIM subscription + * when a new SIM subscription has become available. + * <p> + * This Activity will only launch successfully if the newly active subscription ID is set as the + * value of {@link EXTRA_SUB_ID} and the value corresponds with an active SIM subscription. + * <p> + * Input: {@link #EXTRA_SUB_ID}: the subscription ID of the newly active SIM subscription. + * <p> + * Output: Nothing. + * + * @hide + */ + @FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_ACTION_SIM_PREFERENCE_SETTINGS) + @SystemApi + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_SIM_PREFERENCE_SETTINGS = + "android.settings.SIM_PREFERENCE_SETTINGS"; + + /** * Intent Extra: The value of {@link android.app.settings.SettingsEnums#EntryPointType} for * settings metrics that logs the entry point about physical keyboard settings. * <p> diff --git a/core/java/android/security/net/config/CertificatesEntryRef.java b/core/java/android/security/net/config/CertificatesEntryRef.java index 45cd0f011299..a46049fb2f6d 100644 --- a/core/java/android/security/net/config/CertificatesEntryRef.java +++ b/core/java/android/security/net/config/CertificatesEntryRef.java @@ -17,6 +17,7 @@ package android.security.net.config; import android.util.ArraySet; + import java.security.cert.X509Certificate; import java.util.Set; @@ -24,16 +25,23 @@ import java.util.Set; public final class CertificatesEntryRef { private final CertificateSource mSource; private final boolean mOverridesPins; + private final boolean mDisableCT; - public CertificatesEntryRef(CertificateSource source, boolean overridesPins) { + public CertificatesEntryRef(CertificateSource source, boolean overridesPins, + boolean disableCT) { mSource = source; mOverridesPins = overridesPins; + mDisableCT = disableCT; } boolean overridesPins() { return mOverridesPins; } + boolean disableCT() { + return mDisableCT; + } + public Set<TrustAnchor> getTrustAnchors() { // TODO: cache this [but handle mutable sources] Set<TrustAnchor> anchors = new ArraySet<TrustAnchor>(); diff --git a/core/java/android/security/net/config/KeyStoreConfigSource.java b/core/java/android/security/net/config/KeyStoreConfigSource.java index 8d4f098bcb37..a54d8d0499cb 100644 --- a/core/java/android/security/net/config/KeyStoreConfigSource.java +++ b/core/java/android/security/net/config/KeyStoreConfigSource.java @@ -17,8 +17,8 @@ package android.security.net.config; import android.util.Pair; + import java.security.KeyStore; -import java.security.KeyStoreException; import java.util.Set; /** @@ -32,7 +32,7 @@ class KeyStoreConfigSource implements ConfigSource { mConfig = new NetworkSecurityConfig.Builder() .addCertificatesEntryRef( // Use the KeyStore and do not override pins (of which there are none). - new CertificatesEntryRef(new KeyStoreCertificateSource(ks), false)) + new CertificatesEntryRef(new KeyStoreCertificateSource(ks), false, false)) .build(); } diff --git a/core/java/android/security/net/config/NetworkSecurityConfig.java b/core/java/android/security/net/config/NetworkSecurityConfig.java index 129ae63ec9c0..410c68b8d04d 100644 --- a/core/java/android/security/net/config/NetworkSecurityConfig.java +++ b/core/java/android/security/net/config/NetworkSecurityConfig.java @@ -112,7 +112,6 @@ public final class NetworkSecurityConfig { return mHstsEnforced; } - // TODO(b/28746284): add exceptions for user-added certificates and enterprise overrides. public boolean isCertificateTransparencyVerificationRequired() { return mCertificateTransparencyVerificationRequired; } @@ -192,20 +191,21 @@ public final class NetworkSecurityConfig { * @hide */ public static Builder getDefaultBuilder(ApplicationInfo info) { + // System certificate store, does not bypass static pins, does not disable CT. + CertificatesEntryRef systemRef = new CertificatesEntryRef( + SystemCertificateSource.getInstance(), false, false); Builder builder = new Builder() .setHstsEnforced(DEFAULT_HSTS_ENFORCED) - // System certificate store, does not bypass static pins. - .addCertificatesEntryRef( - new CertificatesEntryRef(SystemCertificateSource.getInstance(), false)); + .addCertificatesEntryRef(systemRef); final boolean cleartextTrafficPermitted = info.targetSdkVersion < Build.VERSION_CODES.P && !info.isInstantApp(); builder.setCleartextTrafficPermitted(cleartextTrafficPermitted); // Applications targeting N and above must opt in into trusting the user added certificate // store. if (info.targetSdkVersion <= Build.VERSION_CODES.M && !info.isPrivilegedApp()) { - // User certificate store, does not bypass static pins. + // User certificate store, does not bypass static pins. CT is disabled. builder.addCertificatesEntryRef( - new CertificatesEntryRef(UserCertificateSource.getInstance(), false)); + new CertificatesEntryRef(UserCertificateSource.getInstance(), false, true)); } return builder; } @@ -339,6 +339,16 @@ public final class NetworkSecurityConfig { if (mCertificateTransparencyVerificationRequiredSet) { return mCertificateTransparencyVerificationRequired; } + // CT verification has not been set explicitly. Before deferring to + // the parent, check if any of the CertificatesEntryRef requires it + // to be disabled (i.e., user store or inline certificate). + if (hasCertificatesEntryRefs()) { + for (CertificatesEntryRef ref : getCertificatesEntryRefs()) { + if (ref.disableCT()) { + return false; + } + } + } if (mParentBuilder != null) { return mParentBuilder.getCertificateTransparencyVerificationRequired(); } diff --git a/core/java/android/security/net/config/XmlConfigSource.java b/core/java/android/security/net/config/XmlConfigSource.java index b1c14793bbbd..95e579fc538b 100644 --- a/core/java/android/security/net/config/XmlConfigSource.java +++ b/core/java/android/security/net/config/XmlConfigSource.java @@ -182,6 +182,7 @@ public class XmlConfigSource implements ConfigSource { boolean overridePins = parser.getAttributeBooleanValue(null, "overridePins", defaultOverridePins); int sourceId = parser.getAttributeResourceValue(null, "src", -1); + boolean disableCT = false; String sourceString = parser.getAttributeValue(null, "src"); CertificateSource source = null; if (sourceString == null) { @@ -190,10 +191,12 @@ public class XmlConfigSource implements ConfigSource { if (sourceId != -1) { // TODO: Cache ResourceCertificateSources by sourceId source = new ResourceCertificateSource(sourceId, mContext); + disableCT = true; } else if ("system".equals(sourceString)) { source = SystemCertificateSource.getInstance(); } else if ("user".equals(sourceString)) { source = UserCertificateSource.getInstance(); + disableCT = true; } else if ("wfa".equals(sourceString)) { source = WfaCertificateSource.getInstance(); } else { @@ -201,7 +204,7 @@ public class XmlConfigSource implements ConfigSource { + "Should be one of system|user|@resourceVal"); } XmlUtils.skipCurrentTag(parser); - return new CertificatesEntryRef(source, overridePins); + return new CertificatesEntryRef(source, overridePins, disableCT); } private Collection<CertificatesEntryRef> parseTrustAnchors(XmlResourceParser parser, diff --git a/core/java/android/service/autofill/AutofillService.java b/core/java/android/service/autofill/AutofillService.java index 269839b61bef..2d922b4c09ee 100644 --- a/core/java/android/service/autofill/AutofillService.java +++ b/core/java/android/service/autofill/AutofillService.java @@ -15,9 +15,12 @@ */ package android.service.autofill; +import static android.service.autofill.Flags.FLAG_AUTOFILL_SESSION_DESTROYED; + import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage; import android.annotation.CallSuper; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SdkConstant; @@ -669,6 +672,14 @@ public abstract class AutofillService extends Service { AutofillService.this, new SavedDatasetsInfoCallbackImpl(receiver, SavedDatasetsInfo.TYPE_PASSWORDS))); } + + @Override + public void onSessionDestroyed(@Nullable FillEventHistory history) { + mHandler.sendMessage(obtainMessage( + AutofillService::onSessionDestroyed, + AutofillService.this, + history)); + } }; private Handler mHandler; @@ -783,26 +794,42 @@ public abstract class AutofillService extends Service { } /** - * Gets the events that happened after the last - * {@link AutofillService#onFillRequest(FillRequest, android.os.CancellationSignal, FillCallback)} + * Called when an Autofill context has ended and the Autofill session is finished. This will be + * called as the last step of the Autofill lifecycle described in {@link AutofillManager}. + * + * <p>This will also contain the finished Session's FillEventHistory, so providers do not need + * to explicitly call {@link #getFillEventHistory()} + * + * <p>This will usually happens whenever {@link AutofillManager#commit()} or {@link + * AutofillManager#cancel()} is called. + */ + @FlaggedApi(FLAG_AUTOFILL_SESSION_DESTROYED) + public void onSessionDestroyed(@Nullable FillEventHistory history) {} + + /** + * Gets the events that happened after the last {@link + * AutofillService#onFillRequest(FillRequest, android.os.CancellationSignal, FillCallback)} * call. * * <p>This method is typically used to keep track of previous user actions to optimize further * requests. For example, the service might return email addresses in alphabetical order by * default, but change that order based on the address the user picked on previous requests. * - * <p>The history is not persisted over reboots, and it's cleared every time the service - * replies to a {@link #onFillRequest(FillRequest, CancellationSignal, FillCallback)} by calling - * {@link FillCallback#onSuccess(FillResponse)} or {@link FillCallback#onFailure(CharSequence)} - * (if the service doesn't call any of these methods, the history will clear out after some - * pre-defined time). Hence, the service should call {@link #getFillEventHistory()} before - * finishing the {@link FillCallback}. + * <p>The history is not persisted over reboots, and it's cleared every time the service replies + * to a {@link #onFillRequest(FillRequest, CancellationSignal, FillCallback)} by calling {@link + * FillCallback#onSuccess(FillResponse)} or {@link FillCallback#onFailure(CharSequence)} (if the + * service doesn't call any of these methods, the history will clear out after some pre-defined + * time). Hence, the service should call {@link #getFillEventHistory()} before finishing the + * {@link FillCallback}. * * @return The history or {@code null} if there are no events. - * * @throws RuntimeException if the event history could not be retrieved. + * @deprecated Use {@link #onSessionDestroyed(FillEventHistory) instead} */ - @Nullable public final FillEventHistory getFillEventHistory() { + @FlaggedApi(FLAG_AUTOFILL_SESSION_DESTROYED) + @Deprecated + @Nullable + public final FillEventHistory getFillEventHistory() { final AutofillManager afm = getSystemService(AutofillManager.class); if (afm == null) { diff --git a/core/java/android/service/autofill/IAutoFillService.aidl b/core/java/android/service/autofill/IAutoFillService.aidl index 3b64b8a0ec5e..71b75e7789c2 100644 --- a/core/java/android/service/autofill/IAutoFillService.aidl +++ b/core/java/android/service/autofill/IAutoFillService.aidl @@ -25,6 +25,8 @@ import android.service.autofill.ISaveCallback; import android.service.autofill.SaveRequest; import com.android.internal.os.IResultReceiver; +parcelable FillEventHistory; + /** * Interface from the system to an auto fill service. * @@ -38,4 +40,5 @@ oneway interface IAutoFillService { void onSaveRequest(in SaveRequest request, in ISaveCallback callback); void onSavedPasswordCountRequest(in IResultReceiver receiver); void onConvertCredentialRequest(in ConvertCredentialRequest convertCredentialRequest, in IConvertCredentialCallback convertCredentialCallback); + void onSessionDestroyed(in FillEventHistory history); } diff --git a/core/java/android/service/settings/preferences/SettingsPreferenceMetadata.java b/core/java/android/service/settings/preferences/SettingsPreferenceMetadata.java index 1acb7b8460cf..ea7d4a675713 100644 --- a/core/java/android/service/settings/preferences/SettingsPreferenceMetadata.java +++ b/core/java/android/service/settings/preferences/SettingsPreferenceMetadata.java @@ -187,27 +187,39 @@ public final class SettingsPreferenceMetadata implements Parcelable { /** @hide */ @IntDef(value = { - NOT_SENSITIVE, - SENSITIVE, - INTENT_ONLY + NO_SENSITIVITY, + EXPECT_POST_CONFIRMATION, + EXPECT_PRE_CONFIRMATION, + NO_DIRECT_ACCESS, }) @Retention(RetentionPolicy.SOURCE) public @interface WriteSensitivity {} /** - * Preference is not sensitive, thus its value is writable without explicit consent, assuming - * all necessary permissions are granted. + * Indicates preference is not sensitive. + * <p>Its value is writable without explicit consent, assuming all necessary permissions are + * granted. */ - public static final int NOT_SENSITIVE = 0; + public static final int NO_SENSITIVITY = 0; /** - * Preference is sensitive, meaning that in addition to necessary permissions, writing its value - * will also request explicit user consent. + * Indicates preference is mildly sensitive. + * <p>In addition to necessary permissions, after writing its value the user should be + * given the option to revert back. */ - public static final int SENSITIVE = 1; + public static final int EXPECT_POST_CONFIRMATION = 1; /** - * Preference is not permitted for write-access via API and must be changed via Settings page. + * Indicates preference is sensitive. + * <p>In addition to necessary permissions, the user should be prompted for confirmation prior + * to making a change. Otherwise it is suggested to provide a deeplink to the Preference's page + * instead, accessible via {@link #getLaunchIntent}. */ - public static final int INTENT_ONLY = 2; + public static final int EXPECT_PRE_CONFIRMATION = 2; + /** + * Indicates preference is highly sensitivity and carries significant user-risk. + * <p>This Preference cannot be changed through this API and no direct deeplink is available. + * Other Metadata is still available. + */ + public static final int NO_DIRECT_ACCESS = 3; private SettingsPreferenceMetadata(@NonNull Builder builder) { mKey = builder.mKey; @@ -303,7 +315,7 @@ public final class SettingsPreferenceMetadata implements Parcelable { private boolean mAvailable = false; private boolean mWritable = false; private boolean mRestricted = false; - @WriteSensitivity private int mSensitivity = INTENT_ONLY; + @WriteSensitivity private int mSensitivity = NO_DIRECT_ACCESS; private Intent mLaunchIntent; private Bundle mExtras; @@ -436,6 +448,9 @@ public final class SettingsPreferenceMetadata implements Parcelable { */ @NonNull public SettingsPreferenceMetadata build() { + if (mSensitivity == NO_DIRECT_ACCESS) { + mLaunchIntent = null; + } return new SettingsPreferenceMetadata(this); } } diff --git a/core/java/android/view/DisplayEventReceiver.java b/core/java/android/view/DisplayEventReceiver.java index bb233d2711de..3ff5f95cd71f 100644 --- a/core/java/android/view/DisplayEventReceiver.java +++ b/core/java/android/view/DisplayEventReceiver.java @@ -286,7 +286,7 @@ public abstract class DisplayEventReceiver { * @param timestampNanos The timestamp of the event, in the {@link System#nanoTime()} * timebase. * @param physicalDisplayId Stable display ID that uniquely describes a (display, port) pair. - * @param modeId The new mode Id + * @param modeId The new mode ID * @param renderPeriod The render frame period, which is a multiple of the mode's vsync period */ public void onModeChanged(long timestampNanos, long physicalDisplayId, int modeId, @@ -294,6 +294,15 @@ public abstract class DisplayEventReceiver { } /** + * Called when a display mode rejection event is received. + * + * @param physicalDisplayId Stable display ID that uniquely describes a (display, port) pair. + * @param modeId The mode ID of the mode that was rejected + */ + public void onModeRejected(long physicalDisplayId, int modeId) { + } + + /** * Called when a display hdcp levels change event is received. * * @param physicalDisplayId Stable display ID that uniquely describes a (display, port) pair. @@ -386,6 +395,12 @@ public abstract class DisplayEventReceiver { // Called from native code. @SuppressWarnings("unused") + private void dispatchModeRejected(long physicalDisplayId, int modeId) { + onModeRejected(physicalDisplayId, modeId); + } + + // Called from native code. + @SuppressWarnings("unused") private void dispatchFrameRateOverrides(long timestampNanos, long physicalDisplayId, FrameRateOverride[] overrides) { onFrameRateOverridesChanged(timestampNanos, physicalDisplayId, overrides); diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java index 8b6458a54c43..43078847326c 100644 --- a/core/java/android/view/DisplayInfo.java +++ b/core/java/android/view/DisplayInfo.java @@ -361,6 +361,12 @@ public final class DisplayInfo implements Parcelable { public float brightnessDefault; /** + * The current dim brightness of the display. Value between 0.0 and 1.0, + * derived from the configuration of the display device of this logical display. + */ + public float brightnessDim; + + /** * The {@link RoundedCorners} if present, otherwise {@code null}. */ @Nullable @@ -479,6 +485,7 @@ public final class DisplayInfo implements Parcelable { && brightnessMinimum == other.brightnessMinimum && brightnessMaximum == other.brightnessMaximum && brightnessDefault == other.brightnessDefault + && brightnessDim == other.brightnessDim && Objects.equals(roundedCorners, other.roundedCorners) && installOrientation == other.installOrientation && Objects.equals(displayShape, other.displayShape) @@ -546,6 +553,7 @@ public final class DisplayInfo implements Parcelable { brightnessMinimum = other.brightnessMinimum; brightnessMaximum = other.brightnessMaximum; brightnessDefault = other.brightnessDefault; + brightnessDim = other.brightnessDim; roundedCorners = other.roundedCorners; installOrientation = other.installOrientation; displayShape = other.displayShape; @@ -620,6 +628,7 @@ public final class DisplayInfo implements Parcelable { brightnessMinimum = source.readFloat(); brightnessMaximum = source.readFloat(); brightnessDefault = source.readFloat(); + brightnessDim = source.readFloat(); roundedCorners = source.readTypedObject(RoundedCorners.CREATOR); int numUserDisabledFormats = source.readInt(); userDisabledHdrTypes = new int[numUserDisabledFormats]; @@ -696,6 +705,7 @@ public final class DisplayInfo implements Parcelable { dest.writeFloat(brightnessMinimum); dest.writeFloat(brightnessMaximum); dest.writeFloat(brightnessDefault); + dest.writeFloat(brightnessDim); dest.writeTypedObject(roundedCorners, flags); dest.writeInt(userDisabledHdrTypes.length); for (int i = 0; i < userDisabledHdrTypes.length; i++) { @@ -994,6 +1004,8 @@ public final class DisplayInfo implements Parcelable { sb.append(brightnessMaximum); sb.append(", brightnessDefault "); sb.append(brightnessDefault); + sb.append(", brightnessDim "); + sb.append(brightnessDim); sb.append(", installOrientation "); sb.append(Surface.rotationToString(installOrientation)); sb.append(", layoutLimitedRefreshRate "); diff --git a/core/java/android/view/InsetsSource.java b/core/java/android/view/InsetsSource.java index b796e0b1c429..ba208390c8b7 100644 --- a/core/java/android/view/InsetsSource.java +++ b/core/java/android/view/InsetsSource.java @@ -357,6 +357,31 @@ public class InsetsSource implements Parcelable { } else if (mTmpFrame.right == relativeFrame.right) { return Insets.of(0, 0, mTmpFrame.width(), 0); } + } else { + // The source doesn't cover the width or the height of relativeFrame, but just parts of + // them. Here uses mSideHint to decide which side should be inset. + switch (mSideHint) { + case SIDE_LEFT: + if (mTmpFrame.left == relativeFrame.left) { + return Insets.of(mTmpFrame.width(), 0, 0, 0); + } + break; + case SIDE_TOP: + if (mTmpFrame.top == relativeFrame.top) { + return Insets.of(0, mTmpFrame.height(), 0, 0); + } + break; + case SIDE_RIGHT: + if (mTmpFrame.right == relativeFrame.right) { + return Insets.of(0, 0, mTmpFrame.width(), 0); + } + break; + case SIDE_BOTTOM: + if (mTmpFrame.bottom == relativeFrame.bottom) { + return Insets.of(0, 0, 0, mTmpFrame.height()); + } + break; + } } return Insets.NONE; } diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java index 03f9d9814b43..6e6e87bb9403 100644 --- a/core/java/android/view/Surface.java +++ b/core/java/android/view/Surface.java @@ -205,7 +205,8 @@ public class Surface implements Parcelable { /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(prefix = {"FRAME_RATE_COMPATIBILITY_"}, - value = {FRAME_RATE_COMPATIBILITY_DEFAULT, FRAME_RATE_COMPATIBILITY_FIXED_SOURCE}) + value = {FRAME_RATE_COMPATIBILITY_DEFAULT, FRAME_RATE_COMPATIBILITY_FIXED_SOURCE, + FRAME_RATE_COMPATIBILITY_GTE}) public @interface FrameRateCompatibility {} // From native_window.h. Keep these in sync. @@ -214,6 +215,11 @@ public class Surface implements Parcelable { * system selects a frame rate other than what the app requested, the app will be able * to run at the system frame rate without requiring pull down. This value should be * used when displaying game content, UIs, and anything that isn't video. + * + * In Android version {@link Build.VERSION_CODES#BAKLAVA} and above, use + * {@link FRAME_RATE_COMPATIBILITY_DEFAULT} for game content. + * For other cases, see {@link FRAME_RATE_COMPATIBILITY_FIXED_SOURCE} and + * {@link FRAME_RATE_COMPATIBILITY_GTE}. */ public static final int FRAME_RATE_COMPATIBILITY_DEFAULT = 0; @@ -228,6 +234,17 @@ public class Surface implements Parcelable { public static final int FRAME_RATE_COMPATIBILITY_FIXED_SOURCE = 1; /** + * The surface requests a frame rate that is greater than or equal to the specified frame rate. + * This value should be used for UIs, animations, scrolling and fling, and anything that is not + * a game or video. + * + * For video, use {@link FRAME_RATE_COMPATIBILITY_FIXED_SOURCE} instead. For game content, use + * {@link FRAME_RATE_COMPATIBILITY_DEFAULT}. + */ + @FlaggedApi(com.android.graphics.surfaceflinger.flags.Flags.FLAG_ARR_SETFRAMERATE_GTE_ENUM) + public static final int FRAME_RATE_COMPATIBILITY_GTE = 2; + + /** * This surface belongs to an app on the High Refresh Rate Deny list, and needs the display * to operate at the exact frame rate. * @@ -250,13 +267,6 @@ public class Surface implements Parcelable { */ public static final int FRAME_RATE_COMPATIBILITY_MIN = 102; - // From window.h. Keep these in sync. - /** - * The surface requests a frame rate that is greater than or equal to {@code frameRate}. - * @hide - */ - public static final int FRAME_RATE_COMPATIBILITY_GTE = 103; - /** @hide */ @Retention(RetentionPolicy.SOURCE) @IntDef(prefix = {"CHANGE_FRAME_RATE_"}, diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 02c79015fab2..0681745a0fc6 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -28278,13 +28278,27 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mPrivateFlags |= PFLAG_INVALIDATED; if (mParent != null) { - mParent.requestLayout(); + if (!mParent.isLayoutRequested()) { + mParent.requestLayout(); + } else { + clearMeasureCacheOfAncestors(); + } } if (mAttachInfo != null && mAttachInfo.mViewRequestingLayout == this) { mAttachInfo.mViewRequestingLayout = null; } } + private void clearMeasureCacheOfAncestors() { + ViewParent parent = mParent; + while (parent instanceof View view) { + if (view.mMeasureCache != null) { + view.mMeasureCache.clear(); + } + parent = view.mParent; + } + } + /** * Forces this view to be laid out during the next layout pass. * This method does not call requestLayout() or forceLayout() @@ -28640,8 +28654,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ @RemotableViewMethod public void setMinimumHeight(int minHeight) { - mMinHeight = minHeight; - requestLayout(); + if (mMinHeight != minHeight) { + mMinHeight = minHeight; + requestLayout(); + } } /** @@ -28671,8 +28687,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ @RemotableViewMethod public void setMinimumWidth(int minWidth) { - mMinWidth = minWidth; - requestLayout(); + if (mMinWidth != minWidth) { + mMinWidth = minWidth; + requestLayout(); + } } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 31330204e8c6..1596b85bb461 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -18,7 +18,6 @@ package android.view; import static android.adpf.Flags.adpfViewrootimplActionDownBoost; import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; -import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.content.pm.ActivityInfo.OVERRIDE_SANDBOX_VIEW_BOUNDS_APIS; import static android.graphics.HardwareRenderer.SYNC_CONTEXT_IS_STOPPED; import static android.graphics.HardwareRenderer.SYNC_LOST_SURFACE_REWARD_IF_FOUND; @@ -2255,7 +2254,7 @@ public final class ViewRootImpl implements ViewParent, onClientWindowFramesChanged(frames); - CompatibilityInfo.applyOverrideScaleIfNeeded(mergedConfiguration); + CompatibilityInfo.applyOverrideIfNeeded(mergedConfiguration); final Rect frame = frames.frame; final Rect displayFrame = frames.displayFrame; final Rect attachedFrame = frames.attachedFrame; @@ -2653,8 +2652,7 @@ public final class ViewRootImpl implements ViewParent, mStopped = stopped; final ThreadedRenderer renderer = mAttachInfo.mThreadedRenderer; if (renderer != null) { - if (DEBUG_DRAW) - Log.d(mTag, "WindowStopped on " + getTitle() + " set to " + mStopped); + if (DEBUG_DRAW) Log.d(mTag, "WindowStopped on " + getTitle() + " set to " + mStopped); renderer.setStopped(mStopped); } if (!mStopped) { @@ -7979,9 +7977,8 @@ public final class ViewRootImpl implements ViewParent, } private boolean moveFocusToAdjacentWindow(@FocusDirection int direction) { - final int windowingMode = getConfiguration().windowConfiguration.getWindowingMode(); - if (!(windowingMode == WINDOWING_MODE_MULTI_WINDOW - || windowingMode == WINDOWING_MODE_FREEFORM)) { + if (getConfiguration().windowConfiguration.getWindowingMode() + != WINDOWING_MODE_MULTI_WINDOW) { return false; } try { @@ -9461,7 +9458,7 @@ public final class ViewRootImpl implements ViewParent, mTranslator.translateRectInScreenToAppWindow(mTmpFrames.attachedFrame); } mInvCompatScale = 1f / mTmpFrames.compatScale; - CompatibilityInfo.applyOverrideScaleIfNeeded(mPendingMergedConfiguration); + CompatibilityInfo.applyOverrideIfNeeded(mPendingMergedConfiguration); handleInsetsControlChanged(mTempInsets, mTempControls); mPendingAlwaysConsumeSystemBars = diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 1e8cad61381c..101d5c950b71 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -80,6 +80,9 @@ import static android.view.WindowLayoutParamsProto.WINDOW_ANIMATIONS; import static android.view.WindowLayoutParamsProto.X; import static android.view.WindowLayoutParamsProto.Y; +import static com.android.hardware.input.Flags.FLAG_OVERRIDE_POWER_KEY_BEHAVIOR_IN_FOCUSED_WINDOW; +import static com.android.hardware.input.Flags.overridePowerKeyBehaviorInFocusedWindow; + import android.Manifest.permission; import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; @@ -4465,6 +4468,29 @@ public interface WindowManager extends ViewManager { public static final int INPUT_FEATURE_SENSITIVE_FOR_PRIVACY = 1 << 3; /** + * Input feature used to indicate that the system should send power key events to this + * window when it's in the foreground. The window can override the double press power key + * gesture behavior. + * + * A double press gesture is defined as two + * {@link KeyEvent.Callback#onKeyDown(int, KeyEvent)} events within a time span defined by + * {@link ViewConfiguration#getMultiPressTimeout()}. + * + * Note: While the window may receive all power key {@link KeyEvent}s, it can only + * override the double press gesture behavior. The system will perform default behavior for + * single, long-press and other multi-press gestures, regardless of if the app handles the + * key or not. + * + * To override the default behavior for double press, the app must return true for the + * second {@link KeyEvent.Callback#onKeyDown(int, KeyEvent)}. If the app returns false, the + * system behavior will be performed for double press. + * @hide + */ + @RequiresPermission(permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) + public static final int + INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS = 1 << 4; + + /** * An internal annotation for flags that can be specified to {@link #inputFeatures}. * * NOTE: These are not the same as {@link android.os.InputConfig} flags. @@ -4477,6 +4503,7 @@ public interface WindowManager extends ViewManager { INPUT_FEATURE_DISABLE_USER_ACTIVITY, INPUT_FEATURE_SPY, INPUT_FEATURE_SENSITIVE_FOR_PRIVACY, + INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS }) public @interface InputFeatureFlags { } @@ -4766,6 +4793,44 @@ public interface WindowManager extends ViewManager { } /** + * Specifies if the system should send power key events to this window when it's in the + * foreground, with only the double tap gesture behavior being overrideable. + * + * @param enabled if true, the system should send power key events to this window when it's + * in the foreground, with only the power key double tap gesture being + * overrideable. + * @hide + */ + @SystemApi + @RequiresPermission(permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) + @FlaggedApi(FLAG_OVERRIDE_POWER_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) + public void setReceivePowerKeyDoublePressEnabled(boolean enabled) { + if (enabled) { + inputFeatures + |= INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS; + } else { + inputFeatures + &= ~INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS; + } + } + + /** + * Returns whether or not the system should send power key events to this window when it's + * in the foreground, with only the double tap gesture being overrideable. + * + * @return if the system should send power key events to this window when it's in the + * foreground, with only the double tap gesture being overrideable. + * @hide + */ + @SystemApi + @RequiresPermission(permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) + @FlaggedApi(FLAG_OVERRIDE_POWER_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) + public boolean isReceivePowerKeyDoublePressEnabled() { + return (inputFeatures + & INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS) != 0; + } + + /** * Specifies that the window should be considered a trusted system overlay. Trusted system * overlays are ignored when considering whether windows are obscured during input * dispatch. Requires the {@link android.Manifest.permission#INTERNAL_SYSTEM_WINDOW} @@ -6157,6 +6222,16 @@ public interface WindowManager extends ViewManager { inputFeatures &= ~INPUT_FEATURE_SPY; features.add("INPUT_FEATURE_SPY"); } + if (overridePowerKeyBehaviorInFocusedWindow()) { + if ((inputFeatures + & INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS) + != 0) { + inputFeatures + &= + ~INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS; + features.add("INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS"); + } + } if (inputFeatures != 0) { features.add(Integer.toHexString(inputFeatures)); } diff --git a/core/java/android/view/flags/view_flags.aconfig b/core/java/android/view/flags/view_flags.aconfig index 641b01054acb..f6fdec94c332 100644 --- a/core/java/android/view/flags/view_flags.aconfig +++ b/core/java/android/view/flags/view_flags.aconfig @@ -142,4 +142,12 @@ flag { description: "Recover from buffer stuffing when SurfaceFlinger misses a frame" bug: "294922229" is_fixed_read_only: true -}
\ No newline at end of file +} + +flag { + name: "date_time_view_relative_time_display_configs" + namespace: "systemui" + description: "Enables DateTimeView to use additional display configurations for relative time" + bug: "364653005" + is_fixed_read_only: true +} diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 5dd29b26730d..6d89f3d89077 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -946,11 +946,16 @@ public final class InputMethodManager { if (state == WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN) { // when losing focus (e.g., by going to another window), we reset the // requestedVisibleTypes of WindowInsetsController by hiding the IME + final var statsToken = ImeTracker.forLogging().onStart( + ImeTracker.TYPE_HIDE, ImeTracker.ORIGIN_CLIENT, + SoftInputShowHideReason.REASON_HIDE_WINDOW_LOST_FOCUS, + false /* fromUser */); if (DEBUG) { Log.d(TAG, "onWindowLostFocus, hiding IME because " + "of STATE_ALWAYS_HIDDEN"); } - mCurRootView.getInsetsController().hide(WindowInsets.Type.ime()); + mCurRootView.getInsetsController().hide(WindowInsets.Type.ime(), + false /* fromIme */, statsToken); } } diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index 41ff69d6fb5f..143b4b770984 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -21,6 +21,7 @@ import static android.text.format.DateUtils.HOUR_IN_MILLIS; import static android.text.format.DateUtils.MINUTE_IN_MILLIS; import static android.text.format.DateUtils.YEAR_IN_MILLIS; +import android.annotation.IntDef; import android.app.ActivityThread; import android.compat.annotation.UnsupportedAppUsage; import android.content.BroadcastReceiver; @@ -41,6 +42,8 @@ import android.widget.RemoteViews.RemoteView; import com.android.internal.R; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.text.DateFormat; import java.time.Instant; import java.time.LocalDate; @@ -70,6 +73,23 @@ public class DateTimeView extends TextView { private static final int SHOW_TIME = 0; private static final int SHOW_MONTH_DAY_YEAR = 1; + /** @hide */ + @IntDef(value = {UNIT_DISPLAY_LENGTH_SHORTEST, UNIT_DISPLAY_LENGTH_MEDIUM}) + @Retention(RetentionPolicy.SOURCE) + public @interface UnitDisplayLength {} + public static final int UNIT_DISPLAY_LENGTH_SHORTEST = 0; + public static final int UNIT_DISPLAY_LENGTH_MEDIUM = 1; + + /** @hide */ + @IntDef(flag = true, value = {DISAMBIGUATION_TEXT_PAST, DISAMBIGUATION_TEXT_FUTURE}) + @Retention(RetentionPolicy.SOURCE) + public @interface DisambiguationTextMask {} + public static final int DISAMBIGUATION_TEXT_PAST = 0x01; + public static final int DISAMBIGUATION_TEXT_FUTURE = 0x02; + + private final boolean mCanUseRelativeTimeDisplayConfigs = + android.view.flags.Flags.dateTimeViewRelativeTimeDisplayConfigs(); + private long mTimeMillis; // The LocalDateTime equivalent of mTimeMillis but truncated to minute, i.e. no seconds / nanos. private LocalDateTime mLocalTime; @@ -81,6 +101,8 @@ public class DateTimeView extends TextView { private static final ThreadLocal<ReceiverInfo> sReceiverInfo = new ThreadLocal<ReceiverInfo>(); private String mNowText; private boolean mShowRelativeTime; + private int mRelativeTimeDisambiguationTextMask; + private int mRelativeTimeUnitDisplayLength = UNIT_DISPLAY_LENGTH_SHORTEST; public DateTimeView(Context context) { this(context, null); @@ -89,20 +111,23 @@ public class DateTimeView extends TextView { @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) public DateTimeView(Context context, AttributeSet attrs) { super(context, attrs); - final TypedArray a = context.obtainStyledAttributes(attrs, - com.android.internal.R.styleable.DateTimeView, 0, - 0); - - final int N = a.getIndexCount(); - for (int i = 0; i < N; i++) { - int attr = a.getIndex(i); - switch (attr) { - case R.styleable.DateTimeView_showRelative: - boolean relative = a.getBoolean(i, false); - setShowRelativeTime(relative); - break; - } + final TypedArray a = context.obtainStyledAttributes( + attrs, R.styleable.DateTimeView, 0, 0); + + setShowRelativeTime(a.getBoolean(R.styleable.DateTimeView_showRelative, false)); + if (mCanUseRelativeTimeDisplayConfigs) { + setRelativeTimeDisambiguationTextMask( + a.getInt( + R.styleable.DateTimeView_relativeTimeDisambiguationText, + // The original implementation showed disambiguation text for future + // times only, so continue with that default. + DISAMBIGUATION_TEXT_FUTURE)); + setRelativeTimeUnitDisplayLength( + a.getInt( + R.styleable.DateTimeView_relativeTimeUnitDisplayLength, + UNIT_DISPLAY_LENGTH_SHORTEST)); } + a.recycle(); } @@ -150,6 +175,29 @@ public class DateTimeView extends TextView { update(); } + /** See {@link R.styleable.DateTimeView_relativeTimeDisambiguationText}. */ + @android.view.RemotableViewMethod + public void setRelativeTimeDisambiguationTextMask( + @DisambiguationTextMask int disambiguationTextMask) { + if (!mCanUseRelativeTimeDisplayConfigs) { + return; + } + mRelativeTimeDisambiguationTextMask = disambiguationTextMask; + updateNowText(); + update(); + } + + /** See {@link R.styleable.DateTimeView_relativeTimeUnitDisplayLength}. */ + @android.view.RemotableViewMethod + public void setRelativeTimeUnitDisplayLength(@UnitDisplayLength int unitDisplayLength) { + if (!mCanUseRelativeTimeDisplayConfigs) { + return; + } + mRelativeTimeUnitDisplayLength = unitDisplayLength; + updateNowText(); + update(); + } + /** * Returns whether this view shows relative time * @@ -264,17 +312,11 @@ public class DateTimeView extends TextView { return; } else if (duration < HOUR_IN_MILLIS) { count = (int)(duration / MINUTE_IN_MILLIS); - result = getContext().getResources().getString(past - ? com.android.internal.R.string.duration_minutes_shortest - : com.android.internal.R.string.duration_minutes_shortest_future, - count); + result = getContext().getResources().getString(getMinutesStringId(past), count); millisIncrease = MINUTE_IN_MILLIS; } else if (duration < DAY_IN_MILLIS) { count = (int)(duration / HOUR_IN_MILLIS); - result = getContext().getResources().getString(past - ? com.android.internal.R.string.duration_hours_shortest - : com.android.internal.R.string.duration_hours_shortest_future, - count); + result = getContext().getResources().getString(getHoursStringId(past), count); millisIncrease = HOUR_IN_MILLIS; } else if (duration < YEAR_IN_MILLIS) { // In weird cases it can become 0 because of daylight savings @@ -283,10 +325,7 @@ public class DateTimeView extends TextView { LocalDateTime localNow = toLocalDateTime(now, zoneId); count = Math.max(Math.abs(dayDistance(localDateTime, localNow)), 1); - result = getContext().getResources().getString(past - ? com.android.internal.R.string.duration_days_shortest - : com.android.internal.R.string.duration_days_shortest_future, - count); + result = getContext().getResources().getString(getDaysStringId(past), count); if (past || count != 1) { mUpdateTimeMillis = computeNextMidnight(localNow, zoneId); millisIncrease = -1; @@ -296,10 +335,7 @@ public class DateTimeView extends TextView { } else { count = (int)(duration / YEAR_IN_MILLIS); - result = getContext().getResources().getString(past - ? com.android.internal.R.string.duration_years_shortest - : com.android.internal.R.string.duration_years_shortest_future, - count); + result = getContext().getResources().getString(getYearsStringId(past), count); millisIncrease = YEAR_IN_MILLIS; } if (millisIncrease != -1) { @@ -312,6 +348,139 @@ public class DateTimeView extends TextView { maybeSetText(result); } + private int getMinutesStringId(boolean past) { + if (!mCanUseRelativeTimeDisplayConfigs) { + return past + ? com.android.internal.R.string.duration_minutes_shortest + : com.android.internal.R.string.duration_minutes_shortest_future; + } + + if (mRelativeTimeUnitDisplayLength == UNIT_DISPLAY_LENGTH_SHORTEST) { + if (past && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_PAST) != 0) { + // "1m ago" + return com.android.internal.R.string.duration_minutes_shortest_past; + } else if (!past + && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_FUTURE) != 0) { + // "in 1m" + return com.android.internal.R.string.duration_minutes_shortest_future; + } else { + // "1m" + return com.android.internal.R.string.duration_minutes_shortest; + } + } else { // UNIT_DISPLAY_LENGTH_MEDIUM + if (past && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_PAST) != 0) { + // "1min ago" + return com.android.internal.R.string.duration_minutes_medium_past; + } else if (!past + && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_FUTURE) != 0) { + // "in 1min" + return com.android.internal.R.string.duration_minutes_medium_future; + } else { + // "1min" + return com.android.internal.R.string.duration_minutes_medium; + } + } + } + + private int getHoursStringId(boolean past) { + if (!mCanUseRelativeTimeDisplayConfigs) { + return past + ? com.android.internal.R.string.duration_hours_shortest + : com.android.internal.R.string.duration_hours_shortest_future; + } + if (mRelativeTimeUnitDisplayLength == UNIT_DISPLAY_LENGTH_SHORTEST) { + if (past && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_PAST) != 0) { + // "1h ago" + return com.android.internal.R.string.duration_hours_shortest_past; + } else if (!past + && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_FUTURE) != 0) { + // "in 1h" + return com.android.internal.R.string.duration_hours_shortest_future; + } else { + // "1h" + return com.android.internal.R.string.duration_hours_shortest; + } + } else { // UNIT_DISPLAY_LENGTH_MEDIUM + if (past && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_PAST) != 0) { + // "1hr ago" + return com.android.internal.R.string.duration_hours_medium_past; + } else if (!past + && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_FUTURE) != 0) { + // "in 1hr" + return com.android.internal.R.string.duration_hours_medium_future; + } else { + // "1hr" + return com.android.internal.R.string.duration_hours_medium; + } + } + } + + private int getDaysStringId(boolean past) { + if (!mCanUseRelativeTimeDisplayConfigs) { + return past + ? com.android.internal.R.string.duration_days_shortest + : com.android.internal.R.string.duration_days_shortest_future; + } + if (mRelativeTimeUnitDisplayLength == UNIT_DISPLAY_LENGTH_SHORTEST) { + if (past && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_PAST) != 0) { + // "1d ago" + return com.android.internal.R.string.duration_days_shortest_past; + } else if (!past + && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_FUTURE) != 0) { + // "in 1d" + return com.android.internal.R.string.duration_days_shortest_future; + } else { + // "1d" + return com.android.internal.R.string.duration_days_shortest; + } + } else { // UNIT_DISPLAY_LENGTH_MEDIUM + if (past && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_PAST) != 0) { + // "1d ago" + return com.android.internal.R.string.duration_days_medium_past; + } else if (!past + && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_FUTURE) != 0) { + // "in 1d" + return com.android.internal.R.string.duration_days_medium_future; + } else { + // "1d" + return com.android.internal.R.string.duration_days_medium; + } + } + } + + private int getYearsStringId(boolean past) { + if (!mCanUseRelativeTimeDisplayConfigs) { + return past + ? com.android.internal.R.string.duration_years_shortest + : com.android.internal.R.string.duration_years_shortest_future; + } + if (mRelativeTimeUnitDisplayLength == UNIT_DISPLAY_LENGTH_SHORTEST) { + if (past && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_PAST) != 0) { + // "1y ago" + return com.android.internal.R.string.duration_years_shortest_past; + } else if (!past + && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_FUTURE) != 0) { + // "in 1y" + return com.android.internal.R.string.duration_years_shortest_future; + } else { + // "1y" + return com.android.internal.R.string.duration_years_shortest; + } + } else { // UNIT_DISPLAY_LENGTH_MEDIUM + if (past && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_PAST) != 0) { + // "1y ago" + return com.android.internal.R.string.duration_years_medium_past; + } else if (!past + && (mRelativeTimeDisambiguationTextMask & DISAMBIGUATION_TEXT_FUTURE) != 0) { + // "in 1y" + return com.android.internal.R.string.duration_years_medium_future; + } else { + // "1y" + return com.android.internal.R.string.duration_years_medium; + } + } + } + /** * Sets text only if the text has actually changed. This prevents needles relayouts of this * view when set to wrap_content. diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 7e3b90444429..2cd390113040 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -128,6 +128,7 @@ import com.android.internal.R; import com.android.internal.util.Preconditions; import com.android.internal.widget.IRemoteViewsFactory; import com.android.internal.widget.remotecompose.core.operations.Theme; +import com.android.internal.widget.remotecompose.core.CoreDocument; import com.android.internal.widget.remotecompose.player.RemoteComposeDocument; import com.android.internal.widget.remotecompose.player.RemoteComposePlayer; @@ -5825,7 +5826,7 @@ public class RemoteViews implements Parcelable, Filter { } try (ByteArrayInputStream is = new ByteArrayInputStream(bytes.get(0))) { player.setDocument(new RemoteComposeDocument(is)); - player.addClickListener((viewId, metadata) -> { + player.addIdActionListener((viewId, metadata) -> { mActions.forEach(action -> { if (viewId == action.mViewId && action instanceof SetOnClickResponse setOnClickResponse) { @@ -9829,7 +9830,7 @@ public class RemoteViews implements Parcelable, Filter { */ @FlaggedApi(FLAG_DRAW_DATA_PARCEL) public static long getSupportedVersion() { - return VERSION; + return (long) CoreDocument.getDocumentApiLevel(); } /** diff --git a/core/java/android/window/SystemPerformanceHinter.java b/core/java/android/window/SystemPerformanceHinter.java index cc2329fc47cb..f8899c5764aa 100644 --- a/core/java/android/window/SystemPerformanceHinter.java +++ b/core/java/android/window/SystemPerformanceHinter.java @@ -163,7 +163,6 @@ public class SystemPerformanceHinter { // The active sessions private final ArrayList<HighPerfSession> mActiveSessions = new ArrayList<>(); private final SurfaceControl.Transaction mTransaction; - private final PerformanceHintManager mPerfHintManager; private @Nullable PerformanceHintManager.Session mAdpfSession; private @Nullable DisplayRootProvider mDisplayRootProvider; @@ -184,7 +183,6 @@ public class SystemPerformanceHinter { @Nullable DisplayRootProvider displayRootProvider, @Nullable Supplier<SurfaceControl.Transaction> transactionSupplier) { mDisplayRootProvider = displayRootProvider; - mPerfHintManager = context.getSystemService(PerformanceHintManager.class); mTransaction = transactionSupplier != null ? transactionSupplier.get() : new SurfaceControl.Transaction(); @@ -273,7 +271,7 @@ public class SystemPerformanceHinter { asyncTraceBegin(HINT_SF_EARLY_WAKEUP, Display.INVALID_DISPLAY); } } - if (nowEnabled(oldGlobalFlags, newGlobalFlags, HINT_ADPF)) { + if (mAdpfSession != null && nowEnabled(oldGlobalFlags, newGlobalFlags, HINT_ADPF)) { mAdpfSession.sendHint(PerformanceHintManager.Session.CPU_LOAD_UP); if (isTraceEnabled) { asyncTraceBegin(HINT_ADPF, Display.INVALID_DISPLAY); @@ -323,7 +321,7 @@ public class SystemPerformanceHinter { asyncTraceEnd(HINT_SF_EARLY_WAKEUP); } } - if (nowDisabled(oldGlobalFlags, newGlobalFlags, HINT_ADPF)) { + if (mAdpfSession != null && nowDisabled(oldGlobalFlags, newGlobalFlags, HINT_ADPF)) { mAdpfSession.sendHint(PerformanceHintManager.Session.CPU_LOAD_RESET); if (isTraceEnabled) { asyncTraceEnd(HINT_ADPF); diff --git a/core/java/android/window/WindowTokenClient.java b/core/java/android/window/WindowTokenClient.java index 6e76d8d345b2..a551fe701c5b 100644 --- a/core/java/android/window/WindowTokenClient.java +++ b/core/java/android/window/WindowTokenClient.java @@ -166,7 +166,7 @@ public class WindowTokenClient extends Binder { @VisibleForTesting public void onConfigurationChangedInner(@NonNull Context context, @NonNull Configuration newConfig, int newDisplayId, boolean shouldReportConfigChange) { - CompatibilityInfo.applyOverrideScaleIfNeeded(newConfig); + CompatibilityInfo.applyOverrideIfNeeded(newConfig); final boolean displayChanged; final boolean shouldUpdateResources; final int diff; diff --git a/core/java/android/window/flags/lse_desktop_experience.aconfig b/core/java/android/window/flags/lse_desktop_experience.aconfig index 4fb5fa70c083..8ebc1ed5ae0a 100644 --- a/core/java/android/window/flags/lse_desktop_experience.aconfig +++ b/core/java/android/window/flags/lse_desktop_experience.aconfig @@ -460,4 +460,25 @@ flag { namespace: "lse_desktop_experience" description: "Enable multiple desktop sessions for desktop windowing." bug: "379158791" +} + +flag { + name: "enable_connected_displays_dnd" + namespace: "lse_desktop_experience" + description: "Enable drag-and-drop between connected displays." + bug: "381793841" +} + +flag { + name: "enable_connected_displays_window_drag" + namespace: "lse_desktop_experience" + description: "Enable window drag between connected displays." + bug: "381172172" +} + +flag { + name: "enable_bug_fixes_for_secondary_display" + namespace: "lse_desktop_experience" + description: "Bugfixes / papercuts to bring Desktop Windowing to secondary displays." + bug: "382023296" }
\ No newline at end of file diff --git a/core/java/android/window/flags/windowing_frontend.aconfig b/core/java/android/window/flags/windowing_frontend.aconfig index 0b034b61c72e..30f0c7371270 100644 --- a/core/java/android/window/flags/windowing_frontend.aconfig +++ b/core/java/android/window/flags/windowing_frontend.aconfig @@ -453,3 +453,11 @@ flag { is_fixed_read_only: true bug: "376407910" } + +flag { + name: "relative_insets" + namespace: "windowing_frontend" + description: "Support insets definition and calculation relative to task bounds." + bug: "277292497" + is_fixed_read_only: true +}
\ No newline at end of file diff --git a/core/java/android/window/flags/windowing_sdk.aconfig b/core/java/android/window/flags/windowing_sdk.aconfig index 81734a3e2115..d0d4af6ea598 100644 --- a/core/java/android/window/flags/windowing_sdk.aconfig +++ b/core/java/android/window/flags/windowing_sdk.aconfig @@ -116,3 +116,14 @@ flag { description: "Relax the assumption of non-match parent activity" bug: "356277166" } + +flag { + namespace: "windowing_sdk" + name: "allow_multiple_adjacent_task_fragments" + description: "Refactor to allow more than 2 adjacent TaskFragments" + bug: "373709676" + is_fixed_read_only: true + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java index e2be1f57b1fb..a27eeb8fdd63 100644 --- a/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java +++ b/core/java/com/android/internal/accessibility/AccessibilityShortcutController.java @@ -58,7 +58,6 @@ import android.util.Slog; import android.view.Window; import android.view.WindowManager; import android.view.accessibility.AccessibilityManager; -import android.view.accessibility.Flags; import android.widget.Toast; import com.android.internal.R; @@ -289,9 +288,7 @@ public class AccessibilityShortcutController { cr, Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, DialogStatus.SHOWN, userId); } else { - if (Flags.restoreA11yShortcutTargetService()) { - enableDefaultHardwareShortcut(userId); - } + enableDefaultHardwareShortcut(userId); playNotificationTone(); if (mAlertDialog != null) { mAlertDialog.dismiss(); diff --git a/core/java/com/android/internal/accessibility/dialog/AccessibilityServiceWarning.java b/core/java/com/android/internal/accessibility/dialog/AccessibilityServiceWarning.java index 3557633f87c5..2e1a0bff3cd3 100644 --- a/core/java/com/android/internal/accessibility/dialog/AccessibilityServiceWarning.java +++ b/core/java/com/android/internal/accessibility/dialog/AccessibilityServiceWarning.java @@ -29,7 +29,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.Window; import android.view.WindowManager; -import android.view.accessibility.Flags; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; @@ -65,9 +64,6 @@ public class AccessibilityServiceWarning { Window window = ad.getWindow(); WindowManager.LayoutParams params = window.getAttributes(); params.privateFlags |= SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - if (!Flags.warningUseDefaultDialogType()) { - params.type = WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG; - } window.setAttributes(params); return ad; } diff --git a/core/java/com/android/internal/app/IAppOpsService.aidl b/core/java/com/android/internal/app/IAppOpsService.aidl index 2cfc680a3fe8..f01aa80fab4f 100644 --- a/core/java/com/android/internal/app/IAppOpsService.aidl +++ b/core/java/com/android/internal/app/IAppOpsService.aidl @@ -163,4 +163,5 @@ interface IAppOpsService { void finishOperationForDevice(IBinder clientId, int code, int uid, String packageName, @nullable String attributionTag, int virtualDeviceId); List<AppOpsManager.PackageOps> getPackagesForOpsForDevice(in int[] ops, String persistentDeviceId); + oneway void noteOperationsInBatch(in Map batchedNoteOps); } diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index ee5bd65e76de..644d69919998 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -70,6 +70,7 @@ import android.widget.Toast; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.app.chooser.TargetInfo; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -352,6 +353,7 @@ public class IntentForwarderActivity extends Activity { findViewById(R.id.use_same_profile_browser).setOnClickListener(v -> finish()); findViewById(R.id.button_open).setOnClickListener(v -> { + TargetInfo.refreshIntentCreatorToken(launchIntent); startActivityAsCaller( launchIntent, ActivityOptions.makeCustomAnimation( @@ -476,6 +478,7 @@ public class IntentForwarderActivity extends Activity { private void startActivityAsCaller(Intent newIntent, int userId) { try { + TargetInfo.refreshIntentCreatorToken(newIntent); startActivityAsCaller( newIntent, /* options= */ null, @@ -502,6 +505,7 @@ public class IntentForwarderActivity extends Activity { return; } sanitizeIntent(innerIntent); + TargetInfo.refreshIntentCreatorToken(intentReceived); startActivityAsCaller(intentReceived, null, false, getUserId()); finish(); } @@ -525,6 +529,7 @@ public class IntentForwarderActivity extends Activity { if (singleTabOnly) { intentReceived.putExtra(EXTRA_RESTRICT_TO_SINGLE_USER, true); } + TargetInfo.refreshIntentCreatorToken(intentReceived); startActivityAsCaller(intentReceived, null, false, userId); finish(); } diff --git a/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java b/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java index 473134ea46f3..0c650774105e 100644 --- a/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java +++ b/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java @@ -173,6 +173,7 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable { @Override public boolean startAsCaller(ResolverActivity activity, Bundle options, int userId) { TargetInfo.prepareIntentForCrossProfileLaunch(mResolvedIntent, userId); + TargetInfo.refreshIntentCreatorToken(mResolvedIntent); activity.startActivityAsCaller(mResolvedIntent, options, false, userId); return true; } @@ -180,6 +181,7 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable { @Override public boolean startAsUser(Activity activity, Bundle options, UserHandle user) { TargetInfo.prepareIntentForCrossProfileLaunch(mResolvedIntent, user.getIdentifier()); + TargetInfo.refreshIntentCreatorToken(mResolvedIntent); activity.startActivityAsUser(mResolvedIntent, options, user); return false; } diff --git a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java index d7f3a76c61e0..0eaa43d2c6e8 100644 --- a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java +++ b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java @@ -260,6 +260,7 @@ public final class SelectableTargetInfo implements ChooserTargetInfo { intent.setComponent(mChooserTarget.getComponentName()); intent.putExtras(mChooserTarget.getIntentExtras()); TargetInfo.prepareIntentForCrossProfileLaunch(intent, userId); + TargetInfo.refreshIntentCreatorToken(intent); // Important: we will ignore the target security checks in ActivityManager // if and only if the ChooserTarget's target package is the same package diff --git a/core/java/com/android/internal/app/chooser/TargetInfo.java b/core/java/com/android/internal/app/chooser/TargetInfo.java index 7bb7ddc65c6d..fcf5883cc84b 100644 --- a/core/java/com/android/internal/app/chooser/TargetInfo.java +++ b/core/java/com/android/internal/app/chooser/TargetInfo.java @@ -17,13 +17,17 @@ package com.android.internal.app.chooser; +import static android.security.Flags.preventIntentRedirect; + import android.app.Activity; +import android.app.ActivityManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.os.RemoteException; import android.os.UserHandle; import com.android.internal.app.ResolverActivity; @@ -141,4 +145,20 @@ public interface TargetInfo { intent.fixUris(currentUserId); } } + + /** + * refreshes intent's creatorToken with its current intent key fields. This allows + * ChooserActivity to still keep original creatorToken's creator uid after making changes to + * the intent and still keep it valid. + * @param intent the intent's creatorToken needs to up refreshed. + */ + static void refreshIntentCreatorToken(Intent intent) { + if (!preventIntentRedirect()) return; + try { + intent.setCreatorToken(ActivityManager.getService().refreshIntentCreatorToken( + intent.cloneForCreatorToken())); + } catch (RemoteException e) { + throw new RuntimeException("Failure from system", e); + } + } } diff --git a/core/java/com/android/internal/inputmethod/SoftInputShowHideReason.java b/core/java/com/android/internal/inputmethod/SoftInputShowHideReason.java index 429a6a267bb1..592ea9e5e600 100644 --- a/core/java/com/android/internal/inputmethod/SoftInputShowHideReason.java +++ b/core/java/com/android/internal/inputmethod/SoftInputShowHideReason.java @@ -91,6 +91,7 @@ import java.lang.annotation.Retention; SoftInputShowHideReason.CONTROL_WINDOW_INSETS_ANIMATION, SoftInputShowHideReason.SHOW_INPUT_TARGET_CHANGED, SoftInputShowHideReason.HIDE_INPUT_TARGET_CHANGED, + SoftInputShowHideReason.REASON_HIDE_WINDOW_LOST_FOCUS, }) public @interface SoftInputShowHideReason { /** Default, undefined reason. */ @@ -418,4 +419,7 @@ public @interface SoftInputShowHideReason { * {@link android.view.InsetsController#controlWindowInsetsAnimation}. */ int CONTROL_WINDOW_INSETS_ANIMATION = ImeProtoEnums.REASON_CONTROL_WINDOW_INSETS_ANIMATION; + + /** Hide soft input when the window lost focus. */ + int REASON_HIDE_WINDOW_LOST_FOCUS = ImeProtoEnums.REASON_HIDE_WINDOW_LOST_FOCUS; } diff --git a/core/java/com/android/internal/os/TEST_MAPPING b/core/java/com/android/internal/os/TEST_MAPPING index 4400ed117721..1923c5fb9186 100644 --- a/core/java/com/android/internal/os/TEST_MAPPING +++ b/core/java/com/android/internal/os/TEST_MAPPING @@ -20,7 +20,7 @@ "file_patterns": [ "BinderDeathDispatcher\\.java" ], - "name": "FrameworksCoreTests_internal_os_binder" + "name": "FrameworksCoreTests_all_binder" }, { "file_patterns": [ diff --git a/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java b/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java index c953d88c9482..445dac7411da 100644 --- a/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java +++ b/core/java/com/android/internal/pm/pkg/component/AconfigFlags.java @@ -25,7 +25,6 @@ import android.aconfig.nano.Aconfig.parsed_flags; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.res.Flags; -import android.content.res.XmlResourceParser; import android.os.Environment; import android.os.Process; import android.util.ArrayMap; @@ -247,20 +246,23 @@ public class AconfigFlags { negated = true; featureFlag = featureFlag.substring(1).strip(); } - final Boolean flagValue = getFlagValue(featureFlag); - boolean shouldSkip = false; + Boolean flagValue = getFlagValue(featureFlag); + boolean isUndefined = false; if (flagValue == null) { - Slog.w(LOG_TAG, "Skipping element " + parser.getName() - + " due to unknown feature flag " + featureFlag); - shouldSkip = true; - } else if (flagValue == negated) { + isUndefined = true; + flagValue = false; + } + boolean shouldSkip = false; + if (flagValue == negated) { // Skip if flag==false && attr=="flag" OR flag==true && attr=="!flag" (negated) - Slog.i(LOG_TAG, "Skipping element " + parser.getName() - + " behind feature flag " + featureFlag + " = " + flagValue); shouldSkip = true; } if (pkg != null && android.content.pm.Flags.includeFeatureFlagsInPackageCacher()) { - pkg.addFeatureFlag(featureFlag, flagValue); + if (isUndefined) { + pkg.addFeatureFlag(featureFlag, null); + } else { + pkg.addFeatureFlag(featureFlag, flagValue); + } } return shouldSkip; } diff --git a/core/java/com/android/internal/vibrator/persistence/SerializedBasicEnvelopeEffect.java b/core/java/com/android/internal/vibrator/persistence/SerializedBasicEnvelopeEffect.java new file mode 100644 index 000000000000..a090c7abc2db --- /dev/null +++ b/core/java/com/android/internal/vibrator/persistence/SerializedBasicEnvelopeEffect.java @@ -0,0 +1,184 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.vibrator.persistence; + +import static com.android.internal.vibrator.persistence.XmlConstants.ATTRIBUTE_DURATION_MS; +import static com.android.internal.vibrator.persistence.XmlConstants.ATTRIBUTE_INITIAL_SHARPNESS; +import static com.android.internal.vibrator.persistence.XmlConstants.ATTRIBUTE_INTENSITY; +import static com.android.internal.vibrator.persistence.XmlConstants.ATTRIBUTE_SHARPNESS; +import static com.android.internal.vibrator.persistence.XmlConstants.NAMESPACE; +import static com.android.internal.vibrator.persistence.XmlConstants.TAG_BASIC_ENVELOPE_EFFECT; +import static com.android.internal.vibrator.persistence.XmlConstants.TAG_CONTROL_POINT; + +import android.annotation.NonNull; +import android.os.VibrationEffect; + +import com.android.modules.utils.TypedXmlPullParser; +import com.android.modules.utils.TypedXmlSerializer; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + +/** + * Serialized representation of a basic envelope effect created via + * {@link VibrationEffect.BasicEnvelopeBuilder}. + * + * @hide + */ +final class SerializedBasicEnvelopeEffect implements SerializedComposedEffect.SerializedSegment { + private final BasicControlPoint[] mControlPoints; + private final float mInitialSharpness; + + SerializedBasicEnvelopeEffect(BasicControlPoint[] controlPoints, float initialSharpness) { + mControlPoints = controlPoints; + mInitialSharpness = initialSharpness; + } + + @Override + public void write(@NonNull TypedXmlSerializer serializer) throws IOException { + serializer.startTag(NAMESPACE, TAG_BASIC_ENVELOPE_EFFECT); + + if (!Float.isNaN(mInitialSharpness)) { + serializer.attributeFloat(NAMESPACE, ATTRIBUTE_INITIAL_SHARPNESS, mInitialSharpness); + } + + for (BasicControlPoint point : mControlPoints) { + serializer.startTag(NAMESPACE, TAG_CONTROL_POINT); + serializer.attributeFloat(NAMESPACE, ATTRIBUTE_INTENSITY, point.mIntensity); + serializer.attributeFloat(NAMESPACE, ATTRIBUTE_SHARPNESS, point.mSharpness); + serializer.attributeLong(NAMESPACE, ATTRIBUTE_DURATION_MS, point.mDurationMs); + serializer.endTag(NAMESPACE, TAG_CONTROL_POINT); + } + + serializer.endTag(NAMESPACE, TAG_BASIC_ENVELOPE_EFFECT); + } + + @Override + public void deserializeIntoComposition(@NonNull VibrationEffect.Composition composition) { + VibrationEffect.BasicEnvelopeBuilder builder = new VibrationEffect.BasicEnvelopeBuilder(); + + if (!Float.isNaN(mInitialSharpness)) { + builder.setInitialSharpness(mInitialSharpness); + } + + for (BasicControlPoint point : mControlPoints) { + builder.addControlPoint(point.mIntensity, point.mSharpness, point.mDurationMs); + } + composition.addEffect(builder.build()); + } + + @Override + public String toString() { + return "SerializedBasicEnvelopeEffect{" + + "initialSharpness=" + (Float.isNaN(mInitialSharpness) ? "" : mInitialSharpness) + + ", controlPoints=" + Arrays.toString(mControlPoints) + + '}'; + } + + static final class Builder { + private final List<BasicControlPoint> mControlPoints; + private float mInitialSharpness = Float.NaN; + + Builder() { + mControlPoints = new ArrayList<>(); + } + + void setInitialSharpness(float sharpness) { + mInitialSharpness = sharpness; + } + + void addControlPoint(float intensity, float sharpness, long durationMs) { + mControlPoints.add(new BasicControlPoint(intensity, sharpness, durationMs)); + } + + SerializedBasicEnvelopeEffect build() { + return new SerializedBasicEnvelopeEffect( + mControlPoints.toArray(new BasicControlPoint[0]), mInitialSharpness); + } + } + + /** Parser implementation for {@link SerializedBasicEnvelopeEffect}. */ + static final class Parser { + + @NonNull + static SerializedBasicEnvelopeEffect parseNext(@NonNull TypedXmlPullParser parser, + @XmlConstants.Flags int flags) throws XmlParserException, IOException { + XmlValidator.checkStartTag(parser, TAG_BASIC_ENVELOPE_EFFECT); + XmlValidator.checkTagHasNoUnexpectedAttributes(parser, ATTRIBUTE_INITIAL_SHARPNESS); + + Builder builder = new Builder(); + builder.setInitialSharpness( + XmlReader.readAttributeFloatInRange(parser, ATTRIBUTE_INITIAL_SHARPNESS, 0f, 1f, + Float.NaN)); + + int outerDepth = parser.getDepth(); + + // Read all nested tags + while (XmlReader.readNextTagWithin(parser, outerDepth)) { + parseControlPoint(parser, builder); + // Consume tag + XmlReader.readEndTag(parser); + } + + // Check schema assertions about <basic-envelope-effect> + XmlValidator.checkParserCondition(!builder.mControlPoints.isEmpty(), + "Expected tag %s to have at least one control point", + TAG_BASIC_ENVELOPE_EFFECT); + XmlValidator.checkParserCondition(builder.mControlPoints.getLast().mIntensity == 0, + "Basic envelope effects must end at a zero intensity control point"); + + return builder.build(); + } + + private static void parseControlPoint(TypedXmlPullParser parser, Builder builder) + throws XmlParserException { + XmlValidator.checkStartTag(parser, TAG_CONTROL_POINT); + XmlValidator.checkTagHasNoUnexpectedAttributes( + parser, ATTRIBUTE_DURATION_MS, ATTRIBUTE_INTENSITY, + ATTRIBUTE_SHARPNESS); + float intensity = XmlReader.readAttributeFloatInRange(parser, ATTRIBUTE_INTENSITY, 0, + 1); + float sharpness = XmlReader.readAttributeFloatInRange(parser, ATTRIBUTE_SHARPNESS, 0, + 1); + long durationMs = XmlReader.readAttributePositiveLong(parser, ATTRIBUTE_DURATION_MS); + + builder.addControlPoint(intensity, sharpness, durationMs); + } + } + + private static final class BasicControlPoint { + private final float mIntensity; + private final float mSharpness; + private final long mDurationMs; + + BasicControlPoint(float intensity, float sharpness, long durationMs) { + mIntensity = intensity; + mSharpness = sharpness; + mDurationMs = durationMs; + } + + @Override + public String toString() { + return String.format(Locale.ROOT, "(%.2f, %.2f, %dms)", mIntensity, mSharpness, + mDurationMs); + } + } +} + diff --git a/core/java/com/android/internal/vibrator/persistence/SerializedWaveformEnvelopeEffect.java b/core/java/com/android/internal/vibrator/persistence/SerializedWaveformEnvelopeEffect.java new file mode 100644 index 000000000000..6a893430d7ad --- /dev/null +++ b/core/java/com/android/internal/vibrator/persistence/SerializedWaveformEnvelopeEffect.java @@ -0,0 +1,182 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.vibrator.persistence; + +import static com.android.internal.vibrator.persistence.XmlConstants.ATTRIBUTE_AMPLITUDE; +import static com.android.internal.vibrator.persistence.XmlConstants.ATTRIBUTE_DURATION_MS; +import static com.android.internal.vibrator.persistence.XmlConstants.ATTRIBUTE_FREQUENCY_HZ; +import static com.android.internal.vibrator.persistence.XmlConstants.ATTRIBUTE_INITIAL_FREQUENCY_HZ; +import static com.android.internal.vibrator.persistence.XmlConstants.NAMESPACE; +import static com.android.internal.vibrator.persistence.XmlConstants.TAG_CONTROL_POINT; +import static com.android.internal.vibrator.persistence.XmlConstants.TAG_WAVEFORM_ENVELOPE_EFFECT; + +import android.annotation.NonNull; +import android.os.VibrationEffect; + +import com.android.modules.utils.TypedXmlPullParser; +import com.android.modules.utils.TypedXmlSerializer; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + +/** + * Serialized representation of a waveform envelope effect created via + * {@link VibrationEffect.WaveformEnvelopeBuilder}. + * + * @hide + */ +final class SerializedWaveformEnvelopeEffect implements SerializedComposedEffect.SerializedSegment { + + private final WaveformControlPoint[] mControlPoints; + private final float mInitialFrequency; + + SerializedWaveformEnvelopeEffect(WaveformControlPoint[] controlPoints, float initialFrequency) { + mControlPoints = controlPoints; + mInitialFrequency = initialFrequency; + } + + @Override + public void write(@NonNull TypedXmlSerializer serializer) throws IOException { + serializer.startTag(NAMESPACE, TAG_WAVEFORM_ENVELOPE_EFFECT); + + if (!Float.isNaN(mInitialFrequency)) { + serializer.attributeFloat(NAMESPACE, ATTRIBUTE_INITIAL_FREQUENCY_HZ, mInitialFrequency); + } + + for (WaveformControlPoint point : mControlPoints) { + serializer.startTag(NAMESPACE, TAG_CONTROL_POINT); + serializer.attributeFloat(NAMESPACE, ATTRIBUTE_AMPLITUDE, point.mAmplitude); + serializer.attributeFloat(NAMESPACE, ATTRIBUTE_FREQUENCY_HZ, point.mFrequency); + serializer.attributeLong(NAMESPACE, ATTRIBUTE_DURATION_MS, point.mDurationMs); + serializer.endTag(NAMESPACE, TAG_CONTROL_POINT); + } + + serializer.endTag(NAMESPACE, TAG_WAVEFORM_ENVELOPE_EFFECT); + } + + @Override + public void deserializeIntoComposition(@NonNull VibrationEffect.Composition composition) { + VibrationEffect.WaveformEnvelopeBuilder builder = + new VibrationEffect.WaveformEnvelopeBuilder(); + + if (!Float.isNaN(mInitialFrequency)) { + builder.setInitialFrequencyHz(mInitialFrequency); + } + + for (WaveformControlPoint point : mControlPoints) { + builder.addControlPoint(point.mAmplitude, point.mFrequency, point.mDurationMs); + } + composition.addEffect(builder.build()); + } + + @Override + public String toString() { + return "SerializedWaveformEnvelopeEffect{" + + "InitialFrequency=" + (Float.isNaN(mInitialFrequency) ? "" : mInitialFrequency) + + ", controlPoints=" + Arrays.toString(mControlPoints) + + '}'; + } + + static final class Builder { + private final List<WaveformControlPoint> mControlPoints; + private float mInitialFrequencyHz = Float.NaN; + + Builder() { + mControlPoints = new ArrayList<>(); + } + + void setInitialFrequencyHz(float frequencyHz) { + mInitialFrequencyHz = frequencyHz; + } + + void addControlPoint(float amplitude, float frequencyHz, long durationMs) { + mControlPoints.add(new WaveformControlPoint(amplitude, frequencyHz, durationMs)); + } + + SerializedWaveformEnvelopeEffect build() { + return new SerializedWaveformEnvelopeEffect( + mControlPoints.toArray(new WaveformControlPoint[0]), mInitialFrequencyHz); + } + } + + /** Parser implementation for {@link SerializedWaveformEnvelopeEffect}. */ + static final class Parser { + + @NonNull + static SerializedWaveformEnvelopeEffect parseNext(@NonNull TypedXmlPullParser parser, + @XmlConstants.Flags int flags) throws XmlParserException, IOException { + XmlValidator.checkStartTag(parser, TAG_WAVEFORM_ENVELOPE_EFFECT); + XmlValidator.checkTagHasNoUnexpectedAttributes(parser, ATTRIBUTE_INITIAL_FREQUENCY_HZ); + + Builder builder = new Builder(); + builder.setInitialFrequencyHz( + XmlReader.readAttributePositiveFloat(parser, ATTRIBUTE_INITIAL_FREQUENCY_HZ, + Float.NaN)); + + int outerDepth = parser.getDepth(); + + while (XmlReader.readNextTagWithin(parser, outerDepth)) { + parseControlPoint(parser, builder); + // Consume tag + XmlReader.readEndTag(parser); + } + + // Check schema assertions about <waveform-envelope-effect> + XmlValidator.checkParserCondition(!builder.mControlPoints.isEmpty(), + "Expected tag %s to have at least one control point", + TAG_WAVEFORM_ENVELOPE_EFFECT); + + return builder.build(); + } + + private static void parseControlPoint(TypedXmlPullParser parser, Builder builder) + throws XmlParserException { + XmlValidator.checkStartTag(parser, TAG_CONTROL_POINT); + XmlValidator.checkTagHasNoUnexpectedAttributes( + parser, ATTRIBUTE_DURATION_MS, ATTRIBUTE_AMPLITUDE, + ATTRIBUTE_FREQUENCY_HZ); + float amplitude = XmlReader.readAttributeFloatInRange(parser, ATTRIBUTE_AMPLITUDE, 0, + 1); + float frequencyHz = XmlReader.readAttributePositiveFloat(parser, + ATTRIBUTE_FREQUENCY_HZ); + long durationMs = XmlReader.readAttributePositiveLong(parser, ATTRIBUTE_DURATION_MS); + + builder.addControlPoint(amplitude, frequencyHz, durationMs); + } + } + + private static final class WaveformControlPoint { + private final float mAmplitude; + private final float mFrequency; + private final long mDurationMs; + + WaveformControlPoint(float amplitude, float frequency, long durationMs) { + mAmplitude = amplitude; + mFrequency = frequency; + mDurationMs = durationMs; + } + + @Override + public String toString() { + return String.format(Locale.ROOT, "(%.2f, %.2f, %dms)", mAmplitude, mFrequency, + mDurationMs); + } + } +} diff --git a/core/java/com/android/internal/vibrator/persistence/VibrationEffectXmlParser.java b/core/java/com/android/internal/vibrator/persistence/VibrationEffectXmlParser.java index a9fbcafa128d..314bfe40ee0b 100644 --- a/core/java/com/android/internal/vibrator/persistence/VibrationEffectXmlParser.java +++ b/core/java/com/android/internal/vibrator/persistence/VibrationEffectXmlParser.java @@ -16,11 +16,13 @@ package com.android.internal.vibrator.persistence; +import static com.android.internal.vibrator.persistence.XmlConstants.TAG_BASIC_ENVELOPE_EFFECT; import static com.android.internal.vibrator.persistence.XmlConstants.TAG_PREDEFINED_EFFECT; import static com.android.internal.vibrator.persistence.XmlConstants.TAG_PRIMITIVE_EFFECT; import static com.android.internal.vibrator.persistence.XmlConstants.TAG_VENDOR_EFFECT; import static com.android.internal.vibrator.persistence.XmlConstants.TAG_VIBRATION_EFFECT; import static com.android.internal.vibrator.persistence.XmlConstants.TAG_WAVEFORM_EFFECT; +import static com.android.internal.vibrator.persistence.XmlConstants.TAG_WAVEFORM_ENVELOPE_EFFECT; import android.annotation.NonNull; import android.os.VibrationEffect; @@ -92,6 +94,32 @@ import java.util.List; * } * </pre> * + * * Waveform Envelope effects + * + * <pre> + * {@code + * <vibration-effect> + * <waveform-envelope-effect initialFrequencyHz="20.0"> + * <control-point amplitude="0.2" frequencyHz="80.0" durationMs="50" /> + * <control-point amplitude="0.5" frequencyHz="150.0" durationMs="50" /> + * </envelope-effect> + * </vibration-effect> + * } + * </pre> + * + * * Basic Envelope effects + * + * <pre> + * {@code + * <vibration-effect> + * <basic-envelope-effect initialSharpness="0.3"> + * <control-point intensity="0.2" sharpness="0.5" durationMs="50" /> + * <control-point intensity="0.0" sharpness="1.0" durationMs="50" /> + * </envelope-effect> + * </vibration-effect> + * } + * </pre> + * * @hide */ public class VibrationEffectXmlParser { @@ -151,6 +179,18 @@ public class VibrationEffectXmlParser { serializedVibration = new SerializedComposedEffect( SerializedAmplitudeStepWaveform.Parser.parseNext(parser)); break; + case TAG_WAVEFORM_ENVELOPE_EFFECT: + if (Flags.normalizedPwleEffects()) { + serializedVibration = new SerializedComposedEffect( + SerializedWaveformEnvelopeEffect.Parser.parseNext(parser, flags)); + break; + } // else fall through + case TAG_BASIC_ENVELOPE_EFFECT: + if (Flags.normalizedPwleEffects()) { + serializedVibration = new SerializedComposedEffect( + SerializedBasicEnvelopeEffect.Parser.parseNext(parser, flags)); + break; + } // else fall through default: throw new XmlParserException("Unexpected tag " + parser.getName() + " in vibration tag " + vibrationTagName); diff --git a/core/java/com/android/internal/vibrator/persistence/VibrationEffectXmlSerializer.java b/core/java/com/android/internal/vibrator/persistence/VibrationEffectXmlSerializer.java index cb834a5eac7e..ebe34344c6f5 100644 --- a/core/java/com/android/internal/vibrator/persistence/VibrationEffectXmlSerializer.java +++ b/core/java/com/android/internal/vibrator/persistence/VibrationEffectXmlSerializer.java @@ -19,9 +19,11 @@ package com.android.internal.vibrator.persistence; import android.annotation.NonNull; import android.os.PersistableBundle; import android.os.VibrationEffect; +import android.os.vibrator.BasicPwleSegment; import android.os.vibrator.Flags; import android.os.vibrator.PrebakedSegment; import android.os.vibrator.PrimitiveSegment; +import android.os.vibrator.PwleSegment; import android.os.vibrator.StepSegment; import android.os.vibrator.VibrationEffectSegment; @@ -45,6 +47,8 @@ import java.util.List; * <li>A composition created exclusively via * {@link VibrationEffect.Composition#addPrimitive(int, float, int)} * <li>{@link VibrationEffect#createVendorEffect(PersistableBundle)} + * <li>{@link VibrationEffect.WaveformEnvelopeBuilder} + * <li>{@link VibrationEffect.BasicEnvelopeBuilder} * </ul> * * @hide @@ -77,6 +81,12 @@ public final class VibrationEffectXmlSerializer { if (firstSegment instanceof PrimitiveSegment) { return serializePrimitiveEffect(composed); } + if (Flags.normalizedPwleEffects() && firstSegment instanceof PwleSegment) { + return serializeWaveformEnvelopeEffect(composed); + } + if (Flags.normalizedPwleEffects() && firstSegment instanceof BasicPwleSegment) { + return serializeBasicEnvelopeEffect(composed); + } return serializeWaveformEffect(composed); } @@ -110,6 +120,53 @@ public final class VibrationEffectXmlSerializer { return new SerializedComposedEffect(primitives); } + private static SerializedComposedEffect serializeWaveformEnvelopeEffect( + VibrationEffect.Composed effect) throws XmlSerializerException { + SerializedWaveformEnvelopeEffect.Builder builder = + new SerializedWaveformEnvelopeEffect.Builder(); + List<VibrationEffectSegment> segments = effect.getSegments(); + XmlValidator.checkSerializerCondition(effect.getRepeatIndex() == -1, + "Unsupported repeating waveform envelope effect %s", effect); + for (int i = 0; i < segments.size(); i++) { + XmlValidator.checkSerializerCondition(segments.get(i) instanceof PwleSegment, + "Unsupported segment for waveform envelope effect %s", segments.get(i)); + PwleSegment segment = (PwleSegment) segments.get(i); + + if (i == 0 && segment.getStartFrequencyHz() != segment.getEndFrequencyHz()) { + // Initial frequency explicitly defined. + builder.setInitialFrequencyHz(segment.getStartFrequencyHz()); + } + + builder.addControlPoint(segment.getEndAmplitude(), segment.getEndFrequencyHz(), + segment.getDuration()); + } + + return new SerializedComposedEffect(builder.build()); + } + + private static SerializedComposedEffect serializeBasicEnvelopeEffect( + VibrationEffect.Composed effect) throws XmlSerializerException { + SerializedBasicEnvelopeEffect.Builder builder = new SerializedBasicEnvelopeEffect.Builder(); + List<VibrationEffectSegment> segments = effect.getSegments(); + XmlValidator.checkSerializerCondition(effect.getRepeatIndex() == -1, + "Unsupported repeating basic envelope effect %s", effect); + for (int i = 0; i < segments.size(); i++) { + XmlValidator.checkSerializerCondition(segments.get(i) instanceof BasicPwleSegment, + "Unsupported segment for basic envelope effect %s", segments.get(i)); + BasicPwleSegment segment = (BasicPwleSegment) segments.get(i); + + if (i == 0 && segment.getStartSharpness() != segment.getEndSharpness()) { + // Initial sharpness explicitly defined. + builder.setInitialSharpness(segment.getStartSharpness()); + } + + builder.addControlPoint(segment.getEndIntensity(), segment.getEndSharpness(), + segment.getDuration()); + } + + return new SerializedComposedEffect(builder.build()); + } + private static SerializedComposedEffect serializeWaveformEffect( VibrationEffect.Composed effect) throws XmlSerializerException { SerializedAmplitudeStepWaveform.Builder serializedWaveformBuilder = diff --git a/core/java/com/android/internal/vibrator/persistence/XmlConstants.java b/core/java/com/android/internal/vibrator/persistence/XmlConstants.java index 4122215a2b04..df262cfecd5a 100644 --- a/core/java/com/android/internal/vibrator/persistence/XmlConstants.java +++ b/core/java/com/android/internal/vibrator/persistence/XmlConstants.java @@ -42,14 +42,22 @@ public final class XmlConstants { public static final String TAG_PREDEFINED_EFFECT = "predefined-effect"; public static final String TAG_PRIMITIVE_EFFECT = "primitive-effect"; public static final String TAG_VENDOR_EFFECT = "vendor-effect"; + public static final String TAG_WAVEFORM_ENVELOPE_EFFECT = "waveform-envelope-effect"; + public static final String TAG_BASIC_ENVELOPE_EFFECT = "basic-envelope-effect"; public static final String TAG_WAVEFORM_EFFECT = "waveform-effect"; public static final String TAG_WAVEFORM_ENTRY = "waveform-entry"; public static final String TAG_REPEATING = "repeating"; + public static final String TAG_CONTROL_POINT = "control-point"; public static final String ATTRIBUTE_NAME = "name"; public static final String ATTRIBUTE_FALLBACK = "fallback"; public static final String ATTRIBUTE_DURATION_MS = "durationMs"; public static final String ATTRIBUTE_AMPLITUDE = "amplitude"; + public static final String ATTRIBUTE_FREQUENCY_HZ = "frequencyHz"; + public static final String ATTRIBUTE_INITIAL_FREQUENCY_HZ = "initialFrequencyHz"; + public static final String ATTRIBUTE_INTENSITY = "intensity"; + public static final String ATTRIBUTE_SHARPNESS = "sharpness"; + public static final String ATTRIBUTE_INITIAL_SHARPNESS = "initialSharpness"; public static final String ATTRIBUTE_SCALE = "scale"; public static final String ATTRIBUTE_DELAY_MS = "delayMs"; public static final String ATTRIBUTE_DELAY_TYPE = "delayType"; diff --git a/core/java/com/android/internal/vibrator/persistence/XmlReader.java b/core/java/com/android/internal/vibrator/persistence/XmlReader.java index 0ac6fefc8cb2..1c4a783f0fe4 100644 --- a/core/java/com/android/internal/vibrator/persistence/XmlReader.java +++ b/core/java/com/android/internal/vibrator/persistence/XmlReader.java @@ -221,12 +221,63 @@ public final class XmlReader { if (parser.getAttributeIndex(NAMESPACE, attrName) < 0) { return defaultValue; } + + return readAttributeFloatInRange(parser, attrName, lowerInclusive, upperInclusive); + } + + /** + * Read attribute from current tag as a float within given inclusive range. + */ + public static float readAttributeFloatInRange( + TypedXmlPullParser parser, String attrName, float lowerInclusive, + float upperInclusive) throws XmlParserException { String tagName = parser.getName(); float value = readAttributeFloat(parser, attrName); XmlValidator.checkParserCondition(value >= lowerInclusive && value <= upperInclusive, - "Unexpected %s = %f in tag %s, expected %s in [%f, %f]", - attrName, value, tagName, attrName, lowerInclusive, upperInclusive); + "Unexpected %s = %f in tag %s, expected %s in [%f, %f]", attrName, value, tagName, + attrName, lowerInclusive, upperInclusive); + return value; + } + + /** + * Read attribute from current tag as a positive float, returning default value if attribute + * is missing. + */ + public static float readAttributePositiveFloat(TypedXmlPullParser parser, String attrName, + float defaultValue) throws XmlParserException { + if (parser.getAttributeIndex(NAMESPACE, attrName) < 0) { + return defaultValue; + } + + return readAttributePositiveFloat(parser, attrName); + } + + /** + * Read attribute from current tag as a positive float. + */ + public static float readAttributePositiveFloat(TypedXmlPullParser parser, String attrName) + throws XmlParserException { + String tagName = parser.getName(); + float value = readAttributeFloat(parser, attrName); + + XmlValidator.checkParserCondition(value > 0, + "Unexpected %s = %d in tag %s, expected %s > 0", attrName, value, tagName, + attrName); + return value; + } + + /** + * Read attribute from current tag as a positive long. + */ + public static long readAttributePositiveLong(TypedXmlPullParser parser, String attrName) + throws XmlParserException { + String tagName = parser.getName(); + long value = readAttributeLong(parser, attrName); + + XmlValidator.checkParserCondition(value > 0, + "Unexpected %s = %d in tag %s, expected %s > 0", attrName, value, tagName, + attrName); return value; } @@ -251,4 +302,15 @@ public final class XmlReader { throw XmlParserException.createFromPullParserException(tagName, attrName, rawValue, e); } } + + private static long readAttributeLong(TypedXmlPullParser parser, String attrName) + throws XmlParserException { + String tagName = parser.getName(); + try { + return parser.getAttributeLong(NAMESPACE, attrName); + } catch (XmlPullParserException e) { + String rawValue = parser.getAttributeValue(NAMESPACE, attrName); + throw XmlParserException.createFromPullParserException(tagName, attrName, rawValue, e); + } + } } diff --git a/core/java/com/android/internal/widget/flags.aconfig b/core/java/com/android/internal/widget/flags.aconfig new file mode 100644 index 000000000000..f05aa4f460a5 --- /dev/null +++ b/core/java/com/android/internal/widget/flags.aconfig @@ -0,0 +1,9 @@ +package: "com.android.internal.widget.flags" +container: "system" + +flag { + name: "hide_last_char_with_physical_input" + namespace: "input" + description: "Feature flag for changing the default of hiding the last interacted symbol when a physical input device is present" + bug: "339270220" +} diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/AndroidPlatformSemanticNodeApplier.java b/core/java/com/android/internal/widget/remotecompose/accessibility/AndroidPlatformSemanticNodeApplier.java index 410e021f5162..1bdbaa48d18c 100644 --- a/core/java/com/android/internal/widget/remotecompose/accessibility/AndroidPlatformSemanticNodeApplier.java +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/AndroidPlatformSemanticNodeApplier.java @@ -15,157 +15,72 @@ */ package com.android.internal.widget.remotecompose.accessibility; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.graphics.Rect; import android.view.accessibility.AccessibilityNodeInfo; -import com.android.internal.widget.remotecompose.core.operations.layout.Component; -import com.android.internal.widget.remotecompose.core.semantics.AccessibilitySemantics; -import com.android.internal.widget.remotecompose.core.semantics.AccessibleComponent; -import com.android.internal.widget.remotecompose.core.semantics.CoreSemantics; - -import java.util.List; - public class AndroidPlatformSemanticNodeApplier - implements SemanticNodeApplier<AccessibilityNodeInfo, Component, AccessibilitySemantics> { + extends BaseSemanticNodeApplier<AccessibilityNodeInfo> { private static final String ROLE_DESCRIPTION_KEY = "AccessibilityNodeInfo.roleDescription"; @Override - public void applyComponent( - @NonNull - RemoteComposeDocumentAccessibility<Component, AccessibilitySemantics> - remoteComposeAccessibility, - AccessibilityNodeInfo nodeInfo, - Component component, - List<AccessibilitySemantics> semantics) { - if (component instanceof AccessibleComponent) { - applyContentDescription( - ((AccessibleComponent) component).getContentDescriptionId(), - nodeInfo, - remoteComposeAccessibility); - - applyRole(((AccessibleComponent) component).getRole(), nodeInfo); - } - - applySemantics(remoteComposeAccessibility, nodeInfo, semantics); - - float[] locationInWindow = new float[2]; - component.getLocationInWindow(locationInWindow); - Rect bounds = - new Rect( - (int) locationInWindow[0], - (int) locationInWindow[1], - (int) (locationInWindow[0] + component.getWidth()), - (int) (locationInWindow[1] + component.getHeight())); - //noinspection deprecation - nodeInfo.setBoundsInParent(bounds); - nodeInfo.setBoundsInScreen(bounds); - - if (component instanceof AccessibleComponent) { - applyContentDescription( - ((AccessibleComponent) component).getContentDescriptionId(), - nodeInfo, - remoteComposeAccessibility); - - applyText( - ((AccessibleComponent) component).getTextId(), - nodeInfo, - remoteComposeAccessibility); - - applyRole(((AccessibleComponent) component).getRole(), nodeInfo); - } - - applySemantics(remoteComposeAccessibility, nodeInfo, semantics); - - if (nodeInfo.getText() == null && nodeInfo.getContentDescription() == null) { - nodeInfo.setContentDescription(""); + protected void setClickable(AccessibilityNodeInfo nodeInfo, boolean clickable) { + nodeInfo.setClickable(clickable); + if (clickable) { + nodeInfo.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK); + } else { + nodeInfo.removeAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK); } } - public void applySemantics( - RemoteComposeDocumentAccessibility<Component, AccessibilitySemantics> - remoteComposeAccessibility, - AccessibilityNodeInfo nodeInfo, - List<AccessibilitySemantics> semantics) { - for (AccessibilitySemantics semantic : semantics) { - if (semantic.isInterestingForSemantics()) { - if (semantic instanceof CoreSemantics) { - applyCoreSemantics( - remoteComposeAccessibility, nodeInfo, (CoreSemantics) semantic); - } else if (semantic instanceof AccessibleComponent) { - AccessibleComponent s = (AccessibleComponent) semantic; - - applyContentDescription( - s.getContentDescriptionId(), nodeInfo, remoteComposeAccessibility); - - applyRole(s.getRole(), nodeInfo); - - applyText(s.getTextId(), nodeInfo, remoteComposeAccessibility); - - if (s.isClickable()) { - nodeInfo.setClickable(true); - nodeInfo.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_CLICK); - } - } - } - } + @Override + protected void setEnabled(AccessibilityNodeInfo nodeInfo, boolean enabled) { + nodeInfo.setEnabled(enabled); } - private void applyCoreSemantics( - RemoteComposeDocumentAccessibility<Component, AccessibilitySemantics> - remoteComposeAccessibility, - AccessibilityNodeInfo nodeInfo, - CoreSemantics semantics) { - applyContentDescription( - semantics.getContentDescriptionId(), nodeInfo, remoteComposeAccessibility); + @Override + protected CharSequence getStateDescription(AccessibilityNodeInfo nodeInfo) { + return nodeInfo.getStateDescription(); + } - applyRole(semantics.getRole(), nodeInfo); + @Override + protected void setStateDescription(AccessibilityNodeInfo nodeInfo, CharSequence description) { + nodeInfo.setStateDescription(description); + } - applyText(semantics.getTextId(), nodeInfo, remoteComposeAccessibility); + @Override + protected void setRoleDescription(AccessibilityNodeInfo nodeInfo, String description) { + nodeInfo.getExtras().putCharSequence(ROLE_DESCRIPTION_KEY, description); + } - applyStateDescription( - semantics.getStateDescriptionId(), nodeInfo, remoteComposeAccessibility); + @Override + protected CharSequence getText(AccessibilityNodeInfo nodeInfo) { + return nodeInfo.getText(); + } - nodeInfo.setEnabled(semantics.mEnabled); + @Override + protected void setText(AccessibilityNodeInfo nodeInfo, CharSequence text) { + nodeInfo.setText(text); } - void applyRole(@Nullable AccessibleComponent.Role role, AccessibilityNodeInfo nodeInfo) { - if (role != null) { - nodeInfo.getExtras().putCharSequence(ROLE_DESCRIPTION_KEY, role.getDescription()); - } + @Override + protected CharSequence getContentDescription(AccessibilityNodeInfo nodeInfo) { + return nodeInfo.getContentDescription(); } - void applyContentDescription( - @Nullable Integer contentDescriptionId, - AccessibilityNodeInfo nodeInfo, - RemoteComposeDocumentAccessibility<Component, AccessibilitySemantics> - remoteComposeAccessibility) { - if (contentDescriptionId != null) { - nodeInfo.setContentDescription( - remoteComposeAccessibility.stringValue(contentDescriptionId)); - } + @Override + protected void setContentDescription(AccessibilityNodeInfo nodeInfo, CharSequence description) { + nodeInfo.setContentDescription(description); } - void applyText( - @Nullable Integer textId, - AccessibilityNodeInfo nodeInfo, - RemoteComposeDocumentAccessibility<Component, AccessibilitySemantics> - remoteComposeAccessibility) { - if (textId != null) { - nodeInfo.setText(remoteComposeAccessibility.stringValue(textId)); - } + @Override + protected void setBoundsInScreen(AccessibilityNodeInfo nodeInfo, Rect bounds) { + nodeInfo.setBoundsInParent(bounds); + nodeInfo.setBoundsInScreen(bounds); } - void applyStateDescription( - @Nullable Integer stateDescriptionId, - AccessibilityNodeInfo nodeInfo, - RemoteComposeDocumentAccessibility<Component, AccessibilitySemantics> - remoteComposeAccessibility) { - if (stateDescriptionId != null) { - nodeInfo.setStateDescription( - remoteComposeAccessibility.stringValue(stateDescriptionId)); - } + @Override + protected void setUniqueId(AccessibilityNodeInfo nodeInfo, String id) { + nodeInfo.setUniqueId(id); } } diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/BaseSemanticNodeApplier.java b/core/java/com/android/internal/widget/remotecompose/accessibility/BaseSemanticNodeApplier.java new file mode 100644 index 000000000000..228afb88b5de --- /dev/null +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/BaseSemanticNodeApplier.java @@ -0,0 +1,208 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.internal.widget.remotecompose.accessibility; + +import android.graphics.Rect; + +import com.android.internal.widget.remotecompose.core.operations.layout.Component; +import com.android.internal.widget.remotecompose.core.semantics.AccessibilitySemantics; +import com.android.internal.widget.remotecompose.core.semantics.AccessibleComponent; +import com.android.internal.widget.remotecompose.core.semantics.CoreSemantics; + +import java.util.List; + +/** + * Base class for applying semantic information to a node. + * + * <p>This class provides common functionality for applying semantic information extracted from + * Compose UI components to a node representation used for accessibility purposes. It handles + * applying properties like content description, text, role, clickability, and bounds. + * + * <p>Subclasses are responsible for implementing methods to actually set these properties on the + * specific node type they handle. + * + * @param <N> The type of node this applier works with. + */ +public abstract class BaseSemanticNodeApplier<N> implements SemanticNodeApplier<N> { + @Override + public void applyComponent( + RemoteComposeDocumentAccessibility remoteComposeAccessibility, + N nodeInfo, + Component component, + List<AccessibilitySemantics> semantics) { + float[] locationInWindow = new float[2]; + component.getLocationInWindow(locationInWindow); + Rect bounds = + new Rect( + (int) locationInWindow[0], + (int) locationInWindow[1], + (int) (locationInWindow[0] + component.getWidth()), + (int) (locationInWindow[1] + component.getHeight())); + setBoundsInScreen(nodeInfo, bounds); + + setUniqueId(nodeInfo, String.valueOf(component.getComponentId())); + + if (component instanceof AccessibleComponent) { + applyContentDescription( + ((AccessibleComponent) component).getContentDescriptionId(), + nodeInfo, + remoteComposeAccessibility); + + applyText( + ((AccessibleComponent) component).getTextId(), + nodeInfo, + remoteComposeAccessibility); + + applyRole(((AccessibleComponent) component).getRole(), nodeInfo); + } + + applySemantics(remoteComposeAccessibility, nodeInfo, semantics); + + if (getText(nodeInfo) == null && getContentDescription(nodeInfo) == null) { + setContentDescription(nodeInfo, ""); + } + } + + protected void applySemantics( + RemoteComposeDocumentAccessibility remoteComposeAccessibility, + N nodeInfo, + List<AccessibilitySemantics> semantics) { + for (AccessibilitySemantics semantic : semantics) { + if (semantic.isInterestingForSemantics()) { + if (semantic instanceof CoreSemantics) { + CoreSemantics coreSemantics = (CoreSemantics) semantic; + applyCoreSemantics(remoteComposeAccessibility, nodeInfo, coreSemantics); + } else if (semantic instanceof AccessibleComponent) { + AccessibleComponent accessibleComponent = (AccessibleComponent) semantic; + if (accessibleComponent.isClickable()) { + setClickable(nodeInfo, true); + } + + if (accessibleComponent.getContentDescriptionId() != null) { + applyContentDescription( + accessibleComponent.getContentDescriptionId(), + nodeInfo, + remoteComposeAccessibility); + } + + if (accessibleComponent.getTextId() != null) { + applyText( + accessibleComponent.getTextId(), + nodeInfo, + remoteComposeAccessibility); + } + + applyRole(accessibleComponent.getRole(), nodeInfo); + } + } + } + } + + protected void applyCoreSemantics( + RemoteComposeDocumentAccessibility remoteComposeAccessibility, + N nodeInfo, + CoreSemantics coreSemantics) { + applyContentDescription( + coreSemantics.getContentDescriptionId(), nodeInfo, remoteComposeAccessibility); + + applyRole(coreSemantics.getRole(), nodeInfo); + + applyText(coreSemantics.getTextId(), nodeInfo, remoteComposeAccessibility); + + applyStateDescription( + coreSemantics.getStateDescriptionId(), nodeInfo, remoteComposeAccessibility); + + if (!coreSemantics.mEnabled) { + setEnabled(nodeInfo, false); + } + } + + protected void applyStateDescription( + Integer stateDescriptionId, + N nodeInfo, + RemoteComposeDocumentAccessibility remoteComposeAccessibility) { + if (stateDescriptionId != null) { + setStateDescription( + nodeInfo, + appendNullable( + getStateDescription(nodeInfo), + remoteComposeAccessibility.stringValue(stateDescriptionId))); + } + } + + protected void applyRole(AccessibleComponent.Role role, N nodeInfo) { + if (role != null) { + setRoleDescription(nodeInfo, role.getDescription()); + } + } + + protected void applyText( + Integer textId, + N nodeInfo, + RemoteComposeDocumentAccessibility remoteComposeAccessibility) { + if (textId != null) { + setText( + nodeInfo, + appendNullable( + getText(nodeInfo), remoteComposeAccessibility.stringValue(textId))); + } + } + + protected void applyContentDescription( + Integer contentDescriptionId, + N nodeInfo, + RemoteComposeDocumentAccessibility remoteComposeAccessibility) { + if (contentDescriptionId != null) { + setContentDescription( + nodeInfo, + appendNullable( + getContentDescription(nodeInfo), + remoteComposeAccessibility.stringValue(contentDescriptionId))); + } + } + + private CharSequence appendNullable(CharSequence contentDescription, String value) { + if (contentDescription == null) { + return value; + } else if (value == null) { + return contentDescription; + } else { + return contentDescription + " " + value; + } + } + + protected abstract void setClickable(N nodeInfo, boolean b); + + protected abstract void setEnabled(N nodeInfo, boolean b); + + protected abstract CharSequence getStateDescription(N nodeInfo); + + protected abstract void setStateDescription(N nodeInfo, CharSequence charSequence); + + protected abstract void setRoleDescription(N nodeInfo, String description); + + protected abstract CharSequence getText(N nodeInfo); + + protected abstract void setText(N nodeInfo, CharSequence charSequence); + + protected abstract CharSequence getContentDescription(N nodeInfo); + + protected abstract void setContentDescription(N nodeInfo, CharSequence charSequence); + + protected abstract void setBoundsInScreen(N nodeInfo, Rect bounds); + + protected abstract void setUniqueId(N nodeInfo, String s); +} diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/CoreDocumentAccessibility.java b/core/java/com/android/internal/widget/remotecompose/accessibility/CoreDocumentAccessibility.java index 66a7f0257e0e..2cd4f0362306 100644 --- a/core/java/com/android/internal/widget/remotecompose/accessibility/CoreDocumentAccessibility.java +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/CoreDocumentAccessibility.java @@ -17,10 +17,10 @@ package com.android.internal.widget.remotecompose.accessibility; import android.annotation.Nullable; import android.graphics.PointF; -import android.graphics.Rect; import android.os.Bundle; import com.android.internal.widget.remotecompose.core.CoreDocument; +import com.android.internal.widget.remotecompose.core.Operation; import com.android.internal.widget.remotecompose.core.operations.layout.ClickModifierOperation; import com.android.internal.widget.remotecompose.core.operations.layout.Component; import com.android.internal.widget.remotecompose.core.operations.layout.LayoutComponent; @@ -31,9 +31,9 @@ import com.android.internal.widget.remotecompose.core.semantics.AccessibilitySem import com.android.internal.widget.remotecompose.core.semantics.AccessibleComponent; import com.android.internal.widget.remotecompose.core.semantics.CoreSemantics; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -43,12 +43,9 @@ import java.util.stream.Stream; * list of modifiers that must be tagged with {@link AccessibilitySemantics} either incidentally * (see {@link ClickModifierOperation}) or explicitly (see {@link CoreSemantics}). */ -public class CoreDocumentAccessibility - implements RemoteComposeDocumentAccessibility<Component, AccessibilitySemantics> { +public class CoreDocumentAccessibility implements RemoteComposeDocumentAccessibility { private final CoreDocument mDocument; - private final Rect mMissingBounds = new Rect(0, 0, 1, 1); - public CoreDocumentAccessibility(CoreDocument document) { this.mDocument = document; } @@ -74,17 +71,25 @@ public class CoreDocumentAccessibility } @Override - public List<CoreSemantics.Mode> mergeMode(Component component) { + public CoreSemantics.Mode mergeMode(Component component) { if (!(component instanceof LayoutComponent)) { - return Collections.singletonList(CoreSemantics.Mode.SET); + return CoreSemantics.Mode.SET; } - return ((LayoutComponent) component) - .getComponentModifiers().getList().stream() - .filter(i -> i instanceof AccessibleComponent) - .map(i -> ((AccessibleComponent) i).getMode()) - .filter(Objects::nonNull) - .collect(Collectors.toList()); + CoreSemantics.Mode result = CoreSemantics.Mode.SET; + + for (ModifierOperation modifier : + ((LayoutComponent) component).getComponentModifiers().getList()) { + if (modifier instanceof AccessibleComponent) { + AccessibleComponent semantics = (AccessibleComponent) modifier; + + if (semantics.getMode().ordinal() > result.ordinal()) { + result = semantics.getMode(); + } + } + } + + return result; } @Override @@ -101,6 +106,7 @@ public class CoreDocumentAccessibility @Override public String stringValue(int id) { Object value = mDocument.getRemoteComposeState().getFromId(id); + return value != null ? String.valueOf(value) : null; } @@ -124,12 +130,33 @@ public class CoreDocumentAccessibility } @Override - public List<Integer> semanticallyRelevantChildComponents(Component component) { - return componentStream(component) - .filter(i -> i.getComponentId() != component.getComponentId()) - .filter(CoreDocumentAccessibility::isInteresting) - .map(Component::getComponentId) - .collect(Collectors.toList()); + public List<Integer> semanticallyRelevantChildComponents( + Component component, boolean useUnmergedTree) { + if (!component.isVisible()) { + return Collections.emptyList(); + } + + CoreSemantics.Mode mergeMode = mergeMode(component); + if (mergeMode == CoreSemantics.Mode.CLEAR_AND_SET + || (!useUnmergedTree && mergeMode == CoreSemantics.Mode.MERGE)) { + return Collections.emptyList(); + } + + ArrayList<Integer> result = new ArrayList<>(); + + for (Operation child : component.mList) { + if (child instanceof Component) { + if (isInteresting((Component) child)) { + result.add(((Component) child).getComponentId()); + } else { + result.addAll( + semanticallyRelevantChildComponents( + (Component) child, useUnmergedTree)); + } + } + } + + return result; } static Stream<Component> componentStream(Component root) { @@ -153,12 +180,13 @@ public class CoreDocumentAccessibility } static boolean isInteresting(Component component) { - boolean interesting = - isContainerWithSemantics(component) - || modifiersStream(component) - .anyMatch(CoreDocumentAccessibility::isModifierWithSemantics); + if (!component.isVisible()) { + return false; + } - return interesting && component.isVisible(); + return isContainerWithSemantics(component) + || modifiersStream(component) + .anyMatch(CoreDocumentAccessibility::isModifierWithSemantics); } static boolean isModifierWithSemantics(ModifierOperation modifier) { diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/PlatformRemoteComposeAccessibilityRegistrar.java b/core/java/com/android/internal/widget/remotecompose/accessibility/PlatformRemoteComposeAccessibilityRegistrar.java new file mode 100644 index 000000000000..010253e9cb95 --- /dev/null +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/PlatformRemoteComposeAccessibilityRegistrar.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.internal.widget.remotecompose.accessibility; + +import android.annotation.NonNull; +import android.view.View; + +import com.android.internal.widget.remotecompose.core.CoreDocument; + +/** + * Trivial wrapper for calling setAccessibilityDelegate on a View. This exists primarily because the + * RemoteDocumentPlayer is either running in the platform on a known API version, or outside in + * which case it must use the Androidx ViewCompat class. + */ +public class PlatformRemoteComposeAccessibilityRegistrar + implements RemoteComposeAccessibilityRegistrar { + public PlatformRemoteComposeTouchHelper forRemoteComposePlayer( + View player, @NonNull CoreDocument coreDocument) { + return new PlatformRemoteComposeTouchHelper( + player, + new CoreDocumentAccessibility(coreDocument), + new AndroidPlatformSemanticNodeApplier()); + } + + public void setAccessibilityDelegate(View remoteComposePlayer, CoreDocument document) { + remoteComposePlayer.setAccessibilityDelegate( + forRemoteComposePlayer(remoteComposePlayer, document)); + } + + public void clearAccessibilityDelegate(View remoteComposePlayer) { + remoteComposePlayer.setAccessibilityDelegate(null); + } +} diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/PlatformRemoteComposeTouchHelper.java b/core/java/com/android/internal/widget/remotecompose/accessibility/PlatformRemoteComposeTouchHelper.java index c9ad28ac0731..39a2ab3010ac 100644 --- a/core/java/com/android/internal/widget/remotecompose/accessibility/PlatformRemoteComposeTouchHelper.java +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/PlatformRemoteComposeTouchHelper.java @@ -37,24 +37,23 @@ import java.util.List; import java.util.Set; import java.util.Stack; -public class PlatformRemoteComposeTouchHelper<N, C, S> extends ExploreByTouchHelper { - private final RemoteComposeDocumentAccessibility<C, S> mRemoteDocA11y; +public class PlatformRemoteComposeTouchHelper extends ExploreByTouchHelper { + private final RemoteComposeDocumentAccessibility mRemoteDocA11y; - private final SemanticNodeApplier<AccessibilityNodeInfo, C, S> mApplier; + private final SemanticNodeApplier<AccessibilityNodeInfo> mApplier; public PlatformRemoteComposeTouchHelper( View host, - RemoteComposeDocumentAccessibility<C, S> remoteDocA11y, - SemanticNodeApplier<AccessibilityNodeInfo, C, S> applier) { + RemoteComposeDocumentAccessibility remoteDocA11y, + SemanticNodeApplier<AccessibilityNodeInfo> applier) { super(host); this.mRemoteDocA11y = remoteDocA11y; this.mApplier = applier; } - public static PlatformRemoteComposeTouchHelper< - AccessibilityNodeInfo, Component, AccessibilitySemantics> - forRemoteComposePlayer(View player, @NonNull CoreDocument coreDocument) { - return new PlatformRemoteComposeTouchHelper<>( + public static PlatformRemoteComposeTouchHelper forRemoteComposePlayer( + View player, @NonNull CoreDocument coreDocument) { + return new PlatformRemoteComposeTouchHelper( player, new CoreDocumentAccessibility(coreDocument), new AndroidPlatformSemanticNodeApplier()); @@ -104,18 +103,21 @@ public class PlatformRemoteComposeTouchHelper<N, C, S> extends ExploreByTouchHel Integer componentId = toVisit.remove(0); if (visited.add(componentId)) { - virtualViewIds.add(componentId); + Component component = mRemoteDocA11y.findComponentById(componentId); - C component = mRemoteDocA11y.findComponentById(componentId); + // Only include the root when it has semantics such as content description + if (!RootId.equals(componentId) + || !mRemoteDocA11y.semanticModifiersForComponent(component).isEmpty()) { + virtualViewIds.add(componentId); + } if (component != null) { - boolean allSet = - mRemoteDocA11y.mergeMode(component).stream() - .allMatch(i -> i == Mode.SET); + Mode mergeMode = mRemoteDocA11y.mergeMode(component); - if (allSet) { + if (mergeMode == Mode.SET) { List<Integer> childViews = - mRemoteDocA11y.semanticallyRelevantChildComponents(component); + mRemoteDocA11y.semanticallyRelevantChildComponents( + component, false); toVisit.addAll(childViews); } @@ -127,32 +129,34 @@ public class PlatformRemoteComposeTouchHelper<N, C, S> extends ExploreByTouchHel @Override public void onPopulateNodeForVirtualView( int virtualViewId, @NonNull AccessibilityNodeInfo node) { - C component = mRemoteDocA11y.findComponentById(virtualViewId); + Component component = mRemoteDocA11y.findComponentById(virtualViewId); + + Mode mergeMode = mRemoteDocA11y.mergeMode(component); - List<Mode> mode = mRemoteDocA11y.mergeMode(component); + // default to enabled + node.setEnabled(true); - if (mode.contains(Mode.MERGE)) { + if (mergeMode == Mode.MERGE) { List<Integer> childViews = - mRemoteDocA11y.semanticallyRelevantChildComponents(component); + mRemoteDocA11y.semanticallyRelevantChildComponents(component, true); for (Integer childView : childViews) { onPopulateNodeForVirtualView(childView, node); } } - List<S> semantics = mRemoteDocA11y.semanticModifiersForComponent(component); + List<AccessibilitySemantics> semantics = + mRemoteDocA11y.semanticModifiersForComponent(component); mApplier.applyComponent(mRemoteDocA11y, node, component, semantics); } @Override - protected void onPopulateEventForVirtualView(int virtualViewId, AccessibilityEvent event) { - // TODO - } + protected void onPopulateEventForVirtualView(int virtualViewId, AccessibilityEvent event) {} @Override protected boolean onPerformActionForVirtualView( int virtualViewId, int action, @Nullable Bundle arguments) { - C component = mRemoteDocA11y.findComponentById(virtualViewId); + Component component = mRemoteDocA11y.findComponentById(virtualViewId); if (component != null) { return mRemoteDocA11y.performAction(component, action, arguments); diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeAccessibilityRegistrar.java b/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeAccessibilityRegistrar.java new file mode 100644 index 000000000000..7e8236b35e97 --- /dev/null +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeAccessibilityRegistrar.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.internal.widget.remotecompose.accessibility; + +import android.view.View; + +import com.android.internal.widget.remotecompose.core.CoreDocument; + +/** + * Interface for registering and clearing accessibility delegates for remote compose players. + * + * <p>This interface is responsible for managing the accessibility delegate associated with a remote + * compose player view. It allows for setting and clearing the delegate, which is used to handle + * accessibility events and provide accessibility information for the remote compose content. + */ +public interface RemoteComposeAccessibilityRegistrar { + void setAccessibilityDelegate(View remoteComposePlayer, CoreDocument document); + + void clearAccessibilityDelegate(View remoteComposePlayer); +} diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeDocumentAccessibility.java b/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeDocumentAccessibility.java index 14977becd2d7..50f75e4889dd 100644 --- a/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeDocumentAccessibility.java +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeDocumentAccessibility.java @@ -20,6 +20,8 @@ import android.graphics.PointF; import android.os.Bundle; import android.view.View; +import com.android.internal.widget.remotecompose.core.operations.layout.Component; +import com.android.internal.widget.remotecompose.core.semantics.AccessibilitySemantics; import com.android.internal.widget.remotecompose.core.semantics.CoreSemantics; import java.util.List; @@ -28,11 +30,8 @@ import java.util.List; * Interface for interacting with the accessibility features of a remote Compose UI. This interface * provides methods to perform actions, retrieve state, and query the accessibility tree of the * remote Compose UI. - * - * @param <C> The type of component in the remote Compose UI. - * @param <S> The type representing semantic modifiers applied to components. */ -public interface RemoteComposeDocumentAccessibility<C, S> { +public interface RemoteComposeDocumentAccessibility { // Matches ExploreByTouchHelper.HOST_ID Integer RootId = View.NO_ID; @@ -47,7 +46,7 @@ public interface RemoteComposeDocumentAccessibility<C, S> { * @param arguments Optional arguments for the action. * @return {@code true} if the action was performed successfully, {@code false} otherwise. */ - boolean performAction(C component, int action, Bundle arguments); + boolean performAction(Component component, int action, Bundle arguments); /** * Retrieves the string value associated with the given ID. @@ -65,9 +64,10 @@ public interface RemoteComposeDocumentAccessibility<C, S> { * * @param component The component to retrieve child view IDs from, or [RootId] for the top * level. + * @param useUnmergedTree Whether to include merged children * @return A list of integer IDs representing the child views of the component. */ - List<Integer> semanticallyRelevantChildComponents(C component); + List<Integer> semanticallyRelevantChildComponents(Component component, boolean useUnmergedTree); /** * Retrieves the semantic modifiers associated with a given component. @@ -75,16 +75,16 @@ public interface RemoteComposeDocumentAccessibility<C, S> { * @param component The component for which to retrieve semantic modifiers. * @return A list of semantic modifiers applicable to the component. */ - List<S> semanticModifiersForComponent(C component); + List<AccessibilitySemantics> semanticModifiersForComponent(Component component); /** * Gets all applied merge modes of the given component. A Merge mode is one of Set, Merge or * Clear and describes how to apply and combine hierarchical semantics. * * @param component The component to merge the mode for. - * @return A list of merged modes, potentially conflicting but to be resolved by the caller. + * @return The effective merge modes, potentially conflicting but resolved to a single value. */ - List<CoreSemantics.Mode> mergeMode(C component); + CoreSemantics.Mode mergeMode(Component component); /** * Finds a component by its ID. @@ -93,7 +93,7 @@ public interface RemoteComposeDocumentAccessibility<C, S> { * @return the component with the given ID, or {@code null} if no such component exists */ @Nullable - C findComponentById(int id); + Component findComponentById(int id); @Nullable Integer getComponentIdAt(PointF point); diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeTouchHelper.java b/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeTouchHelper.java index 4ff7892d8224..13641025a33b 100644 --- a/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeTouchHelper.java +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/RemoteComposeTouchHelper.java @@ -15,17 +15,11 @@ */ package com.android.internal.widget.remotecompose.accessibility; -import android.annotation.NonNull; -import android.view.View; - -import com.android.internal.widget.remotecompose.core.CoreDocument; - +/** + * This class is the entry point for finding the AccessibilityDelegate for a RemoteCompose document. + */ public class RemoteComposeTouchHelper { - public static View.AccessibilityDelegate forRemoteComposePlayer( - View player, @NonNull CoreDocument coreDocument) { - return new PlatformRemoteComposeTouchHelper<>( - player, - new CoreDocumentAccessibility(coreDocument), - new AndroidPlatformSemanticNodeApplier()); - } + /** Get the platform specific accessibility delegate registrar */ + public static final RemoteComposeAccessibilityRegistrar REGISTRAR = + new PlatformRemoteComposeAccessibilityRegistrar(); } diff --git a/core/java/com/android/internal/widget/remotecompose/accessibility/SemanticNodeApplier.java b/core/java/com/android/internal/widget/remotecompose/accessibility/SemanticNodeApplier.java index 4368329478f3..832b5426f476 100644 --- a/core/java/com/android/internal/widget/remotecompose/accessibility/SemanticNodeApplier.java +++ b/core/java/com/android/internal/widget/remotecompose/accessibility/SemanticNodeApplier.java @@ -15,6 +15,9 @@ */ package com.android.internal.widget.remotecompose.accessibility; +import com.android.internal.widget.remotecompose.core.operations.layout.Component; +import com.android.internal.widget.remotecompose.core.semantics.AccessibilitySemantics; + import java.util.List; /** @@ -29,15 +32,13 @@ import java.util.List; * * @param <N> The type representing information about the node. This could be an Androidx * `AccessibilityNodeInfoCompat`, or potentially a platform `AccessibilityNodeInfo`. - * @param <C> The type of component in the remote Compose UI. - * @param <S> The type representing a single semantic property or action. */ -public interface SemanticNodeApplier<N, C, S> { +public interface SemanticNodeApplier<N> { void applyComponent( - RemoteComposeDocumentAccessibility<C, S> remoteComposeAccessibility, + RemoteComposeDocumentAccessibility remoteComposeAccessibility, N nodeInfo, - C component, - List<S> semantics); + Component component, + List<AccessibilitySemantics> semantics); String VIRTUAL_VIEW_ID_KEY = "VirtualViewId"; } diff --git a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java index 5bc3bca17dda..1e9ba78e52c5 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java +++ b/core/java/com/android/internal/widget/remotecompose/core/CoreDocument.java @@ -24,6 +24,8 @@ import com.android.internal.widget.remotecompose.core.operations.FloatExpression import com.android.internal.widget.remotecompose.core.operations.IntegerExpression; import com.android.internal.widget.remotecompose.core.operations.NamedVariable; import com.android.internal.widget.remotecompose.core.operations.RootContentBehavior; +import com.android.internal.widget.remotecompose.core.operations.ShaderData; +import com.android.internal.widget.remotecompose.core.operations.TextData; import com.android.internal.widget.remotecompose.core.operations.Theme; import com.android.internal.widget.remotecompose.core.operations.layout.ClickModifierOperation; import com.android.internal.widget.remotecompose.core.operations.layout.Component; @@ -45,6 +47,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Objects; import java.util.Set; /** @@ -441,11 +444,11 @@ public class CoreDocument { mActionListeners.clear(); } - public interface ClickCallbacks { - void click(int id, @Nullable String metadata); + public interface IdActionCallback { + void onAction(int id, @Nullable String metadata); } - @NonNull HashSet<ClickCallbacks> mClickListeners = new HashSet<>(); + @NonNull HashSet<IdActionCallback> mIdActionListeners = new HashSet<>(); @NonNull HashSet<TouchListener> mTouchListeners = new HashSet<>(); @NonNull HashSet<ClickAreaRepresentation> mClickAreas = new HashSet<>(); @@ -470,6 +473,21 @@ public class CoreDocument { float mBottom; @Nullable final String mMetadata; + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ClickAreaRepresentation)) return false; + ClickAreaRepresentation that = (ClickAreaRepresentation) o; + return mId == that.mId + && Objects.equals(mContentDescription, that.mContentDescription) + && Objects.equals(mMetadata, that.mMetadata); + } + + @Override + public int hashCode() { + return Objects.hash(mId, mContentDescription, mMetadata); + } + public ClickAreaRepresentation( int id, @Nullable String contentDescription, @@ -679,6 +697,7 @@ public class CoreDocument { } } } + op.markNotDirty(); op.apply(context); } } @@ -754,9 +773,13 @@ public class CoreDocument { float right, float bottom, @Nullable String metadata) { - mClickAreas.add( + + ClickAreaRepresentation car = new ClickAreaRepresentation( - id, contentDescription, left, top, right, bottom, metadata)); + id, contentDescription, left, top, right, bottom, metadata); + + boolean old = mClickAreas.remove(car); + mClickAreas.add(car); } /** @@ -769,12 +792,12 @@ public class CoreDocument { } /** - * Add a click listener. This will get called when a click is detected on the document + * Add an id action listener. This will get called when e.g. a click is detected on the document * - * @param callback called when a click area has been hit, passing the click are id and metadata. + * @param callback called when an action is executed, passing the id and metadata. */ - public void addClickListener(@NonNull ClickCallbacks callback) { - mClickListeners.add(callback); + public void addIdActionListener(@NonNull IdActionCallback callback) { + mIdActionListeners.add(callback); } /** @@ -783,8 +806,8 @@ public class CoreDocument { * @return set of click listeners */ @NonNull - public HashSet<CoreDocument.ClickCallbacks> getClickListeners() { - return mClickListeners; + public HashSet<IdActionCallback> getIdActionListeners() { + return mIdActionListeners; } /** @@ -813,15 +836,15 @@ public class CoreDocument { warnClickListeners(clickArea); } } - for (ClickCallbacks listener : mClickListeners) { - listener.click(id, ""); + for (IdActionCallback listener : mIdActionListeners) { + listener.onAction(id, ""); } } /** Warn click listeners when a click area is activated */ private void warnClickListeners(@NonNull ClickAreaRepresentation clickArea) { - for (ClickCallbacks listener : mClickListeners) { - listener.click(clickArea.mId, clickArea.mMetadata); + for (IdActionCallback listener : mIdActionListeners) { + listener.onAction(clickArea.mId, clickArea.mMetadata); } } @@ -1067,7 +1090,6 @@ public class CoreDocument { mRepaintNext = 1; } context.mMode = RemoteContext.ContextMode.UNSET; - // System.out.println(">> " + ( System.nanoTime() - time)*1E-6f+" ms"); if (DEBUG && mRootLayoutComponent != null) { System.out.println(mRootLayoutComponent.displayHierarchy()); } @@ -1163,4 +1185,30 @@ public class CoreDocument { public List<Operation> getOperations() { return mOperations; } + + /** defines if a shader can be run */ + public interface ShaderControl { + boolean isShaderValid(String shader); + } + + /** + * validate the shaders + * + * @param context the remote context + * @param ctl the call back to allow evaluation of shaders + */ + public void checkShaders(RemoteContext context, ShaderControl ctl) { + int count = 0; + for (Operation op : mOperations) { + if (op instanceof TextData) { + op.apply(context); + } + if (op instanceof ShaderData) { + ShaderData sd = (ShaderData) op; + int id = sd.getShaderTextId(); + String str = context.getText(id); + sd.enable(ctl.isShaderValid(str)); + } + } + } } diff --git a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java index 11e58ba0796f..5c3df7e95a1f 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java +++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteComposeState.java @@ -333,6 +333,7 @@ public class RemoteComposeState implements CollectionsAccess { public void overrideColor(int id, int color) { mColorOverride[id] = true; mColorMap.put(id, color); + updateListeners(id); } /** Clear the color Overrides */ diff --git a/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java b/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java index 003acb780715..c03f44bfc162 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java +++ b/core/java/com/android/internal/widget/remotecompose/core/RemoteContext.java @@ -493,6 +493,9 @@ public abstract class RemoteContext { public static final int ID_DENSITY = 27; + /** Defines when the last build was made */ + public static final int ID_API_LEVEL = 28; + public static final float FLOAT_DENSITY = Utils.asNan(ID_DENSITY); /** CONTINUOUS_SEC is seconds from midnight looping every hour 0-3600 */ @@ -566,6 +569,9 @@ public abstract class RemoteContext { /** Ambient light level in SI lux */ public static final float FLOAT_LIGHT = Utils.asNan(ID_LIGHT); + /** When was this player built */ + public static final float FLOAT_API_LEVEL = Utils.asNan(ID_API_LEVEL); + /////////////////////////////////////////////////////////////////////////////////////////////// // Click handling /////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java b/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java index 0ed6005da389..cd7ebec67a46 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java +++ b/core/java/com/android/internal/widget/remotecompose/core/TimeVariables.java @@ -24,6 +24,8 @@ import java.time.ZoneOffset; /** This generates the standard system variables for time. */ public class TimeVariables { + private static final float BUILD = 0.01f; + /** * This class populates all time variables in the system * @@ -57,6 +59,7 @@ public class TimeVariables { context.loadFloat(RemoteContext.ID_CALENDAR_MONTH, month); context.loadFloat(RemoteContext.ID_DAY_OF_MONTH, month); context.loadFloat(RemoteContext.ID_WEEK_DAY, day_week); + context.loadFloat(RemoteContext.ID_API_LEVEL, CoreDocument.getDocumentApiLevel() + BUILD); } /** diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java b/core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java index efd31afb1a05..bb112d1cb732 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/ClickArea.java @@ -21,6 +21,7 @@ import com.android.internal.widget.remotecompose.core.Operation; import com.android.internal.widget.remotecompose.core.Operations; import com.android.internal.widget.remotecompose.core.RemoteComposeOperation; import com.android.internal.widget.remotecompose.core.RemoteContext; +import com.android.internal.widget.remotecompose.core.VariableSupport; import com.android.internal.widget.remotecompose.core.WireBuffer; import com.android.internal.widget.remotecompose.core.documentation.DocumentationBuilder; import com.android.internal.widget.remotecompose.core.documentation.DocumentedOperation; @@ -29,7 +30,8 @@ import com.android.internal.widget.remotecompose.core.semantics.AccessibleCompon import java.util.List; /** Add a click area to the document */ -public class ClickArea extends Operation implements RemoteComposeOperation, AccessibleComponent { +public class ClickArea extends Operation + implements RemoteComposeOperation, AccessibleComponent, VariableSupport { private static final int OP_CODE = Operations.CLICK_AREA; private static final String CLASS_NAME = "ClickArea"; int mId; @@ -38,6 +40,10 @@ public class ClickArea extends Operation implements RemoteComposeOperation, Acce float mTop; float mRight; float mBottom; + float mOutLeft; + float mOutTop; + float mOutRight; + float mOutBottom; int mMetadata; /** @@ -62,11 +68,35 @@ public class ClickArea extends Operation implements RemoteComposeOperation, Acce int metadata) { this.mId = id; this.mContentDescription = contentDescription; - this.mLeft = left; - this.mTop = top; - this.mRight = right; - this.mBottom = bottom; - this.mMetadata = metadata; + mOutLeft = mLeft = left; + mOutTop = mTop = top; + mOutRight = mRight = right; + mOutBottom = mBottom = bottom; + mMetadata = metadata; + } + + @Override + public void registerListening(@NonNull RemoteContext context) { + if (Float.isNaN(mLeft)) { + context.listensTo(Utils.idFromNan(mLeft), this); + } + if (Float.isNaN(mTop)) { + context.listensTo(Utils.idFromNan(mTop), this); + } + if (Float.isNaN(mRight)) { + context.listensTo(Utils.idFromNan(mRight), this); + } + if (Float.isNaN(mBottom)) { + context.listensTo(Utils.idFromNan(mBottom), this); + } + } + + @Override + public void updateVariables(@NonNull RemoteContext context) { + mOutLeft = Float.isNaN(mLeft) ? context.getFloat(Utils.idFromNan(mLeft)) : mLeft; + mOutTop = Float.isNaN(mTop) ? context.getFloat(Utils.idFromNan(mTop)) : mTop; + mRight = Float.isNaN(mRight) ? context.getFloat(Utils.idFromNan(mRight)) : mRight; + mOutBottom = Float.isNaN(mBottom) ? context.getFloat(Utils.idFromNan(mBottom)) : mBottom; } @Override @@ -102,10 +132,8 @@ public class ClickArea extends Operation implements RemoteComposeOperation, Acce @Override public void apply(@NonNull RemoteContext context) { - if (context.getMode() != RemoteContext.ContextMode.DATA) { - return; - } - context.addClickArea(mId, mContentDescription, mLeft, mTop, mRight, mBottom, mMetadata); + context.addClickArea( + mId, mContentDescription, mOutLeft, mOutTop, mOutRight, mOutBottom, mMetadata); } @NonNull diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/ShaderData.java b/core/java/com/android/internal/widget/remotecompose/core/operations/ShaderData.java index 8e4098ed51f9..891367e33d87 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/ShaderData.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/ShaderData.java @@ -50,6 +50,7 @@ public class ShaderData extends Operation implements VariableSupport { @Nullable HashMap<String, float[]> mUniformFloatMap = null; @Nullable HashMap<String, int[]> mUniformIntMap; @Nullable HashMap<String, Integer> mUniformBitmapMap = null; + private boolean mShaderValid = false; public ShaderData( int shaderID, @@ -358,7 +359,9 @@ public class ShaderData extends Operation implements VariableSupport { @Override public void apply(@NonNull RemoteContext context) { - context.loadShader(mShaderID, this); + if (mShaderValid) { + context.loadShader(mShaderID, this); + } } @NonNull @@ -366,4 +369,13 @@ public class ShaderData extends Operation implements VariableSupport { public String deepToString(@NonNull String indent) { return indent + toString(); } + + /** + * Enable or disable the shader + * + * @param shaderValid if true shader can be used + */ + public void enable(boolean shaderValid) { + mShaderValid = shaderValid; + } } diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java b/core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java index 6c9105dbadfe..e9aae1ebad45 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/Theme.java @@ -64,6 +64,7 @@ public class Theme extends Operation implements RemoteComposeOperation { @Override public void apply(@NonNull RemoteContext context) { context.setTheme(mTheme); + markDirty(); } @NonNull diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/TouchExpression.java b/core/java/com/android/internal/widget/remotecompose/core/operations/TouchExpression.java index f42abfcd1671..14b72af84e66 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/TouchExpression.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/TouchExpression.java @@ -366,6 +366,7 @@ public class TouchExpression extends Operation implements VariableSupport, Touch /** * Set the component the touch expression is in (if any) + * * @param component the component, or null if outside */ public void setComponent(@Nullable Component component) { diff --git a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/MarqueeModifierOperation.java b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/MarqueeModifierOperation.java index 8b6d49747976..9588e99a65b6 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/MarqueeModifierOperation.java +++ b/core/java/com/android/internal/widget/remotecompose/core/operations/layout/modifiers/MarqueeModifierOperation.java @@ -92,9 +92,7 @@ public class MarqueeModifierOperation extends DecoratorModifierOperation impleme return false; } - /** - * Reset the modifier - */ + /** Reset the modifier */ public void reset() { mLastTime = 0; mScrollX = 0f; diff --git a/core/java/com/android/internal/widget/remotecompose/core/semantics/CoreSemantics.java b/core/java/com/android/internal/widget/remotecompose/core/semantics/CoreSemantics.java index b8166e668ac1..4047dd27d163 100644 --- a/core/java/com/android/internal/widget/remotecompose/core/semantics/CoreSemantics.java +++ b/core/java/com/android/internal/widget/remotecompose/core/semantics/CoreSemantics.java @@ -48,6 +48,11 @@ public class CoreSemantics extends Operation implements AccessibilityModifier { } @Override + public Mode getMode() { + return mMode; + } + + @Override public void write(WireBuffer buffer) { buffer.writeInt(mContentDescriptionId); buffer.writeByte((mRole != null) ? mRole.ordinal() : -1); @@ -78,6 +83,10 @@ public class CoreSemantics extends Operation implements AccessibilityModifier { public String toString() { StringBuilder builder = new StringBuilder(); builder.append("SEMANTICS"); + if (mMode != Mode.SET) { + builder.append(" "); + builder.append(mMode); + } if (mRole != null) { builder.append(" "); builder.append(mRole); diff --git a/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java b/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java index 19453a0016a1..7dad2931c97f 100644 --- a/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java +++ b/core/java/com/android/internal/widget/remotecompose/player/RemoteComposePlayer.java @@ -32,6 +32,7 @@ import android.widget.FrameLayout; import android.widget.HorizontalScrollView; import android.widget.ScrollView; +import com.android.internal.widget.remotecompose.accessibility.RemoteComposeTouchHelper; import com.android.internal.widget.remotecompose.core.CoreDocument; import com.android.internal.widget.remotecompose.core.RemoteContext; import com.android.internal.widget.remotecompose.core.operations.NamedVariable; @@ -61,6 +62,15 @@ public class RemoteComposePlayer extends FrameLayout { } /** + * Returns true if the document supports drag touch events + * + * @return true if draggable content, false otherwise + */ + public boolean isDraggable() { + return mInner.isDraggable(); + } + + /** * Turn on debug information * * @param debugFlags 1 to set debug on @@ -83,9 +93,12 @@ public class RemoteComposePlayer extends FrameLayout { } else { Log.e("RemoteComposePlayer", "Unsupported document "); } + + RemoteComposeTouchHelper.REGISTRAR.setAccessibilityDelegate(this, value.getDocument()); } else { mInner.setDocument(null); - this.setAccessibilityDelegate(null); + + RemoteComposeTouchHelper.REGISTRAR.clearAccessibilityDelegate(this); } mapColors(); setupSensors(); @@ -97,6 +110,7 @@ public class RemoteComposePlayer extends FrameLayout { provideHapticFeedback(type); } }); + mInner.checkShaders(mShaderControl); } /** @@ -236,22 +250,23 @@ public class RemoteComposePlayer extends FrameLayout { mInner.clearLocalString("SYSTEM:" + name); } - public interface ClickCallbacks { - void click(int id, String metadata); + /** Id action callback interface */ + public interface IdActionCallbacks { + void onAction(int id, String metadata); } /** - * Add a callback for handling click events on the document + * Add a callback for handling id actions events on the document * - * @param callback the callback lambda that will be used when a click is detected + * @param callback the callback lambda that will be used when a action is executed * <p>The parameter of the callback are: * <ul> - * <li>id : the id of the clicked area - * <li>metadata: a client provided unstructured string associated with that area + * <li>id : the id of the action + * <li>metadata: a client provided unstructured string associated with that id action * </ul> */ - public void addClickListener(ClickCallbacks callback) { - mInner.addClickListener((id, metadata) -> callback.click(id, metadata)); + public void addIdActionListener(IdActionCallbacks callback) { + mInner.addIdActionListener((id, metadata) -> callback.onAction(id, metadata)); } /** @@ -670,4 +685,19 @@ public class RemoteComposePlayer extends FrameLayout { public float getEvalTime() { return mInner.getEvalTime(); } + + private CoreDocument.ShaderControl mShaderControl = + (shader) -> { + return false; + }; + + /** + * Sets the controller for shaders. Note set before loading the document. The default is to not + * accept shaders. + * + * @param ctl the controller + */ + public void setShaderControl(CoreDocument.ShaderControl ctl) { + mShaderControl = ctl; + } } diff --git a/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidPaintContext.java b/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidPaintContext.java index daa44c8d7312..0712ea496b57 100644 --- a/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidPaintContext.java +++ b/core/java/com/android/internal/widget/remotecompose/player/platform/AndroidPaintContext.java @@ -505,6 +505,9 @@ public class AndroidPaintContext extends PaintContext { return; } ShaderData data = getShaderData(shaderId); + if (data == null) { + return; + } RuntimeShader shader = new RuntimeShader(getText(data.getShaderTextId())); String[] names = data.getUniformFloatNames(); for (int i = 0; i < names.length; i++) { diff --git a/core/java/com/android/internal/widget/remotecompose/player/platform/RemoteComposeCanvas.java b/core/java/com/android/internal/widget/remotecompose/player/platform/RemoteComposeCanvas.java index 8da5b9d161f2..c7b1166e113e 100644 --- a/core/java/com/android/internal/widget/remotecompose/player/platform/RemoteComposeCanvas.java +++ b/core/java/com/android/internal/widget/remotecompose/player/platform/RemoteComposeCanvas.java @@ -205,19 +205,46 @@ public class RemoteComposeCanvas extends FrameLayout implements View.OnAttachSta return count; } + /** + * set a float externally + * + * @param id + * @param value + */ public void setExternalFloat(int id, float value) { mARContext.loadFloat(id, value); } + /** + * Returns true if the document supports drag touch events + * + * @return true if draggable content, false otherwise + */ + public boolean isDraggable() { + if (mDocument == null) { + return false; + } + return mDocument.getDocument().hasTouchListener(); + } + + /** + * Check shaders and disable them + * + * @param shaderControl the callback to validate the shader + */ + public void checkShaders(CoreDocument.ShaderControl shaderControl) { + mDocument.getDocument().checkShaders(mARContext, shaderControl); + } + public interface ClickCallbacks { void click(int id, String metadata); } - public void addClickListener(ClickCallbacks callback) { + public void addIdActionListener(ClickCallbacks callback) { if (mDocument == null) { return; } - mDocument.getDocument().addClickListener((id, metadata) -> callback.click(id, metadata)); + mDocument.getDocument().addIdActionListener((id, metadata) -> callback.click(id, metadata)); } public int getTheme() { @@ -267,6 +294,7 @@ public class RemoteComposeCanvas extends FrameLayout implements View.OnAttachSta invalidate(); return true; } + return false; case MotionEvent.ACTION_UP: mInActionDown = false; @@ -280,6 +308,7 @@ public class RemoteComposeCanvas extends FrameLayout implements View.OnAttachSta invalidate(); return true; } + return false; case MotionEvent.ACTION_MOVE: if (mInActionDown) { @@ -293,6 +322,7 @@ public class RemoteComposeCanvas extends FrameLayout implements View.OnAttachSta } return true; } + return false; } return false; } diff --git a/core/jni/Android.bp b/core/jni/Android.bp index e22d9587093b..b7a7f96e4e1c 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -279,6 +279,7 @@ cc_library_shared_for_libandroid_runtime { "libasync_safe", "libbinderthreadstateutils", "libdmabufinfo", + "libgenfslabelsversion.ffi", "libgui_window_info_static", "libkernelconfigs", "libnativehelper_lazy", diff --git a/core/jni/android_media_AudioFormat.h b/core/jni/android_media_AudioFormat.h index 704aef3cd131..4ba1ae9d670d 100644 --- a/core/jni/android_media_AudioFormat.h +++ b/core/jni/android_media_AudioFormat.h @@ -51,6 +51,18 @@ #define ENCODING_DTS_UHD_P2 30 #define ENCODING_DSD 31 #define ENCODING_AC4_L4 32 +#define ENCODING_IAMF_SIMPLE_PROFILE_OPUS 33 +#define ENCODING_IAMF_SIMPLE_PROFILE_AAC 34 +#define ENCODING_IAMF_SIMPLE_PROFILE_FLAC 35 +#define ENCODING_IAMF_SIMPLE_PROFILE_PCM 36 +#define ENCODING_IAMF_BASE_PROFILE_OPUS 37 +#define ENCODING_IAMF_BASE_PROFILE_AAC 38 +#define ENCODING_IAMF_BASE_PROFILE_FLAC 39 +#define ENCODING_IAMF_BASE_PROFILE_PCM 40 +#define ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS 41 +#define ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC 42 +#define ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC 43 +#define ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM 44 #define ENCODING_INVALID 0 #define ENCODING_DEFAULT 1 @@ -128,6 +140,30 @@ static inline audio_format_t audioFormatToNative(int audioFormat) return AUDIO_FORMAT_DTS_UHD_P2; case ENCODING_DSD: return AUDIO_FORMAT_DSD; + case ENCODING_IAMF_SIMPLE_PROFILE_OPUS: + return AUDIO_FORMAT_IAMF_SIMPLE_OPUS; + case ENCODING_IAMF_SIMPLE_PROFILE_AAC: + return AUDIO_FORMAT_IAMF_SIMPLE_AAC; + case ENCODING_IAMF_SIMPLE_PROFILE_FLAC: + return AUDIO_FORMAT_IAMF_SIMPLE_FLAC; + case ENCODING_IAMF_SIMPLE_PROFILE_PCM: + return AUDIO_FORMAT_IAMF_SIMPLE_PCM; + case ENCODING_IAMF_BASE_PROFILE_OPUS: + return AUDIO_FORMAT_IAMF_BASE_OPUS; + case ENCODING_IAMF_BASE_PROFILE_AAC: + return AUDIO_FORMAT_IAMF_BASE_AAC; + case ENCODING_IAMF_BASE_PROFILE_FLAC: + return AUDIO_FORMAT_IAMF_BASE_FLAC; + case ENCODING_IAMF_BASE_PROFILE_PCM: + return AUDIO_FORMAT_IAMF_BASE_PCM; + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS: + return AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS; + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC: + return AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC; + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC: + return AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC; + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM: + return AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM; default: return AUDIO_FORMAT_INVALID; } @@ -211,6 +247,30 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat) return ENCODING_DEFAULT; case AUDIO_FORMAT_DSD: return ENCODING_DSD; + case AUDIO_FORMAT_IAMF_SIMPLE_OPUS: + return ENCODING_IAMF_SIMPLE_PROFILE_OPUS; + case AUDIO_FORMAT_IAMF_SIMPLE_AAC: + return ENCODING_IAMF_SIMPLE_PROFILE_AAC; + case AUDIO_FORMAT_IAMF_SIMPLE_FLAC: + return ENCODING_IAMF_SIMPLE_PROFILE_FLAC; + case AUDIO_FORMAT_IAMF_SIMPLE_PCM: + return ENCODING_IAMF_SIMPLE_PROFILE_PCM; + case AUDIO_FORMAT_IAMF_BASE_OPUS: + return ENCODING_IAMF_BASE_PROFILE_OPUS; + case AUDIO_FORMAT_IAMF_BASE_AAC: + return ENCODING_IAMF_BASE_PROFILE_AAC; + case AUDIO_FORMAT_IAMF_BASE_FLAC: + return ENCODING_IAMF_BASE_PROFILE_FLAC; + case AUDIO_FORMAT_IAMF_BASE_PCM: + return ENCODING_IAMF_BASE_PROFILE_PCM; + case AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS: + return ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS; + case AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC: + return ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC; + case AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC: + return ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC; + case AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM: + return ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM; default: return ENCODING_INVALID; } diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index 7a4670f4e49d..805d5ad41e83 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -18,18 +18,19 @@ #include <errno.h> #include <fcntl.h> - +#include <genfslabelsversion.h> +#include <nativehelper/JNIPlatformHelp.h> +#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/ScopedUtfChars.h> #include <utils/Log.h> -#include <nativehelper/JNIPlatformHelp.h> -#include "jni.h" +#include <atomic> +#include <memory> + #include "core_jni_helpers.h" -#include "selinux/selinux.h" +#include "jni.h" #include "selinux/android.h" -#include <memory> -#include <atomic> -#include <nativehelper/ScopedLocalRef.h> -#include <nativehelper/ScopedUtfChars.h> +#include "selinux/selinux.h" namespace android { namespace { @@ -404,8 +405,19 @@ static jboolean native_restorecon(JNIEnv *env, jobject, jstring pathnameStr, jin } /* + * Function: getGenfsLabelsVersion + * Purpose: get which genfs labels version /vendor uses + * Returns: int: genfs labels version of /vendor + * Exceptions: none + */ +static jint getGenfsLabelsVersion(JNIEnv *, jclass) { + return get_genfs_labels_version(); +} + +/* * JNI registration. */ +// clang-format off static const JNINativeMethod method_table[] = { /* name, signature, funcPtr */ { "checkSELinuxAccess" , "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z" , (void*)checkSELinuxAccess }, @@ -420,7 +432,9 @@ static const JNINativeMethod method_table[] = { { "setFileContext" , "(Ljava/lang/String;Ljava/lang/String;)Z" , (void*)setFileCon }, { "setFSCreateContext" , "(Ljava/lang/String;)Z" , (void*)setFSCreateCon }, { "fileSelabelLookup" , "(Ljava/lang/String;)Ljava/lang/String;" , (void*)fileSelabelLookup}, + { "getGenfsLabelsVersion" , "()I" , (void *)getGenfsLabelsVersion}, }; +// clang-format on static int log_callback(int type, const char *fmt, ...) { va_list ap; diff --git a/core/jni/android_view_DisplayEventReceiver.cpp b/core/jni/android_view_DisplayEventReceiver.cpp index a09c405de1cd..7ff1f8c4a748 100644 --- a/core/jni/android_view_DisplayEventReceiver.cpp +++ b/core/jni/android_view_DisplayEventReceiver.cpp @@ -40,6 +40,7 @@ static struct { jmethodID dispatchHotplug; jmethodID dispatchHotplugConnectionError; jmethodID dispatchModeChanged; + jmethodID dispatchModeRejected; jmethodID dispatchFrameRateOverrides; jmethodID dispatchHdcpLevelsChanged; @@ -95,6 +96,7 @@ private: void dispatchHotplugConnectionError(nsecs_t timestamp, int errorCode) override; void dispatchModeChanged(nsecs_t timestamp, PhysicalDisplayId displayId, int32_t modeId, nsecs_t renderPeriod) override; + void dispatchModeRejected(PhysicalDisplayId displayId, int32_t modeId) override; void dispatchFrameRateOverrides(nsecs_t timestamp, PhysicalDisplayId displayId, std::vector<FrameRateOverride> overrides) override; void dispatchNullEvent(nsecs_t timestamp, PhysicalDisplayId displayId) override {} @@ -271,6 +273,18 @@ void NativeDisplayEventReceiver::dispatchModeChanged(nsecs_t timestamp, Physical mMessageQueue->raiseAndClearException(env, "dispatchModeChanged"); } +void NativeDisplayEventReceiver::dispatchModeRejected(PhysicalDisplayId displayId, int32_t modeId) { + JNIEnv* env = AndroidRuntime::getJNIEnv(); + + ScopedLocalRef<jobject> receiverObj(env, GetReferent(env, mReceiverWeakGlobal)); + if (receiverObj.get()) { + ALOGV("receiver %p ~ Invoking Mode Rejected handler.", this); + env->CallVoidMethod(receiverObj.get(), gDisplayEventReceiverClassInfo.dispatchModeRejected, + displayId.value, modeId); + ALOGV("receiver %p ~ Returned from Mode Rejected handler.", this); + } +} + void NativeDisplayEventReceiver::dispatchFrameRateOverrides( nsecs_t timestamp, PhysicalDisplayId displayId, std::vector<FrameRateOverride> overrides) { JNIEnv* env = AndroidRuntime::getJNIEnv(); @@ -405,6 +419,9 @@ int register_android_view_DisplayEventReceiver(JNIEnv* env) { gDisplayEventReceiverClassInfo.dispatchModeChanged = GetMethodIDOrDie(env, gDisplayEventReceiverClassInfo.clazz, "dispatchModeChanged", "(JJIJ)V"); + gDisplayEventReceiverClassInfo.dispatchModeRejected = + GetMethodIDOrDie(env, gDisplayEventReceiverClassInfo.clazz, "dispatchModeRejected", + "(JI)V"); gDisplayEventReceiverClassInfo.dispatchFrameRateOverrides = GetMethodIDOrDie(env, gDisplayEventReceiverClassInfo.clazz, "dispatchFrameRateOverrides", diff --git a/core/res/Android.bp b/core/res/Android.bp index aacd8699c202..903d08b9a2ab 100644 --- a/core/res/Android.bp +++ b/core/res/Android.bp @@ -162,6 +162,7 @@ android_app { "android.appwidget.flags-aconfig", "android.companion.virtualdevice.flags-aconfig", "android.content.pm.flags-aconfig", + "android.location.flags-aconfig", "android.media.audio-aconfig", "android.provider.flags-aconfig", "camera_platform_flags", diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 7d77ff054fe6..d0a5318be72c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1139,6 +1139,16 @@ android:protectionLevel="signature|privileged|vendorPrivileged" android:featureFlag="android.media.tv.flags.media_quality_fw"/> + <!-- + @FlaggedApi(android.media.tv.flags.Flags.FLAG_MEDIA_QUALITY_FW) + Allows an application to read the aggregated color zones on the screen for use cases like + TV ambient backlight usages. + <p> Protection level: normal + --> + <permission android:name="android.permission.READ_COLOR_ZONES" + android:protectionLevel="normal" + android:featureFlag="android.media.tv.flags.media_quality_fw"/> + <!-- ====================================================================== --> <!-- Permissions for accessing external storage --> <!-- ====================================================================== --> @@ -2145,6 +2155,21 @@ <permission android:name="android.permission.CONTROL_AUTOMOTIVE_GNSS" android:protectionLevel="signature|privileged" /> + <!-- @SystemApi @hide Allows an application to bind to a + android.service.PopulationDensityProviderService for the purpose of + querying population density. This prevents arbitrary clients connecting + to the service. The system server checks that the provider's intent + service explicitly sets this permission via the android:permission + attribute of the service. + This is only expected to be possessed by the system server outside of + tests. + @FlaggedApi(android.location.flags.Flags.FLAG_POPULATION_DENSITY_PROVIDER) + <p>Protection level: signature + --> + <permission android:name="android.permission.BIND_POPULATION_DENSITY_PROVIDER_SERVICE" + android:featureFlag="android.location.flags.population_density_provider" + android:protectionLevel="signature" /> + <!-- ======================================= --> <!-- Permissions for accessing networks --> <!-- ======================================= --> @@ -4124,6 +4149,14 @@ <permission android:name="android.permission.MANAGE_DEVICE_POLICY_CONTENT_PROTECTION" android:protectionLevel="internal|role" /> + <!-- Allows an application to manage policy related to AppFunctions. + <p>Protection level: internal|role + @FlaggedApi(android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER) + --> + <permission android:name="android.permission.MANAGE_DEVICE_POLICY_APP_FUNCTIONS" + android:featureFlag="android.app.appfunctions.flags.enable_app_function_manager" + android:protectionLevel="internal|role" /> + <!-- Allows an application to set policy related to subscriptions downloaded by an admin. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. diff --git a/core/res/res/layout-round-watch/alert_dialog_title_material.xml b/core/res/res/layout-round-watch/alert_dialog_title_material.xml index 75fe7601317b..dac1e324be81 100644 --- a/core/res/res/layout-round-watch/alert_dialog_title_material.xml +++ b/core/res/res/layout-round-watch/alert_dialog_title_material.xml @@ -14,34 +14,30 @@ ~ 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:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="top|center_horizontal"> - - <FrameLayout +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:adjustViewBounds="true"> - - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" + android:paddingBottom="8dp" + android:orientation="vertical" + android:gravity="top|center_horizontal"> + <FrameLayout + android:adjustViewBounds="true" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="8dp" - android:maxHeight="32dp" - android:maxWidth="32dp" - android:src="@null" /> + android:minHeight="@dimen/screen_percentage_15"> + <ImageView android:id="@+id/icon" + android:adjustViewBounds="true" + android:maxHeight="24dp" + android:maxWidth="24dp" + android:layout_marginTop="@dimen/screen_percentage_10" + android:layout_gravity="center_horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@null" /> </FrameLayout> - - <TextView - android:id="@+id/alertTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/alertDialog_material_side_margin_title" - android:layout_marginEnd="@dimen/alertDialog_material_side_margin_title" - android:textAppearance="@style/TextAppearance.AlertDialog.Title" - android:gravity="center" /> + <TextView android:id="@+id/alertTitle" + style="?android:attr/windowTitleStyle" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> </LinearLayout> diff --git a/core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml b/core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml index af30f1bd164c..8f7545690142 100644 --- a/core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml +++ b/core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml @@ -16,123 +16,98 @@ <!-- This layout is the AlertDialog template. It overrides the system layout with the same name. Make sure to include all the existing id of the overridden alert_dialog_material.--> -<com.android.internal.widget.WatchListDecorLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.internal.widget.WatchListDecorLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/parentPanel" android:layout_width="match_parent" android:layout_height="match_parent"> - <ScrollView android:id="@+id/scrollView" + android:fillViewport="true" android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> - - <requestFocus /> - + android:layout_height="match_parent"> <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" android:orientation="vertical" - android:layout_marginStart="@dimen/alertDialog_material_side_margin" - android:layout_marginEnd="@dimen/alertDialog_material_side_margin" - android:gravity="center_vertical"> - - <!-- Top Spacer --> - <View - android:layout_width="match_parent" - android:layout_height="@dimen/alertDialog_material_top_margin" /> - + android:layout_width="match_parent" + android:layout_height="wrap_content"> <!-- Top Panel --> <FrameLayout - android:id="@+id/topPanel" + android:paddingLeft="?dialogPreferredPadding" + android:paddingRight="?dialogPreferredPadding" android:layout_width="match_parent" android:layout_height="wrap_content" + android:id="@+id/topPanel" android:minHeight="@dimen/dialog_list_padding_top_no_title"> - - <include - android:id="@+id/title_template" - layout="@layout/alert_dialog_title_material" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <include android:id="@+id/title_template" + android:layout_width="match_parent" + android:layout_height="wrap_content" + layout="@layout/alert_dialog_title_material"/> </FrameLayout> <!-- Content Panel --> - <FrameLayout - android:id="@+id/contentPanel" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="12dp"> - - <TextView - android:id="@+id/message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/alertDialog_material_side_margin_body" - android:layout_marginEnd="@dimen/alertDialog_material_side_margin_body" - android:textAppearance="@style/TextAppearance.AlertDialog.Body1" - android:gravity="center_horizontal|top" /> + <FrameLayout android:id="@+id/contentPanel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clipToPadding="false"> + <TextView android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal|top" + android:textAppearance="@style/TextAppearance.DeviceDefault.Body1" + android:paddingStart="?dialogPreferredPadding" + android:paddingEnd="?dialogPreferredPadding" + android:paddingTop="8dip" + android:paddingBottom="8dip"/> </FrameLayout> <!-- Custom Panel, to replace content panel if needed --> - <FrameLayout - android:id="@+id/customPanel" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:minHeight="64dp"> - - <FrameLayout - android:id="@+android:id/custom" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + <FrameLayout android:id="@+id/customPanel" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:minHeight="64dp"> + <FrameLayout android:id="@+android:id/custom" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> </FrameLayout> <!-- Button Panel --> <FrameLayout android:id="@+id/buttonPanel" + android:minHeight="@dimen/dialog_list_padding_bottom_no_buttons" + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center" - android:minHeight="@dimen/dialog_list_padding_bottom_no_buttons"> - + android:layout_gravity="center"> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" android:layout_gravity="bottom" - android:orientation="vertical"> - - <Button - android:id="@+id/button1" - style="@*android:style/Widget.DeviceDefault.Button.Filled" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:gravity="center" /> - - <Button - android:id="@+id/button2" - style="@*android:style/Widget.DeviceDefault.Button.WearMaterial3" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:layout_gravity="center" - android:gravity="center" /> - - <Button - android:id="@+id/button3" - style="?android:attr/buttonBarButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:gravity="center" /> + android:orientation="vertical" + android:paddingBottom="?dialogPreferredPadding" + android:measureWithLargestChild="true"> + <Button android:id="@+id/button2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:layout_weight="1" + style="@*android:style/Widget.DeviceDefault.Button.WearMaterial3"/> + <Button android:id="@+id/button3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center" + android:layout_weight="1" + style="?android:attr/buttonBarButtonStyle"/> + <Button android:id="@+id/button1" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center" + android:gravity="center" + android:layout_weight="1" + style="@*android:style/Widget.DeviceDefault.Button.Filled"/> </LinearLayout> </FrameLayout> - - <!-- Bottom Spacer --> - <View - android:layout_width="match_parent" - android:layout_height="@dimen/alertDialog_material_bottom_margin" /> - </LinearLayout> </ScrollView> </com.android.internal.widget.WatchListDecorLayout> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index bfa3b067ead0..edb926c5a30c 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Beller-ID se verstek is beperk. Volgende oproep: nie beperk nie"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Beller-ID se verstek is nie beperk nie. Volgende oproep: beperk"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Beller-ID se verstek is nie beperk nie. Volgende oproep: nie beperk nie"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Hierdie app is nie versoenbaar met 16 KB nie. APK-belyningkontrole het misluk. Hierdie app sal met bladsygrootteversoenbare modus gebruik word. Stel asseblief weer die app met 16 KB-ondersteuning saam vir beste versoenbaarheid. Sien <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> vir meer inligting"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Hierdie app is nie versoenbaar met 16 KB nie. ELF-belyningkontrole het misluk. Hierdie app sal met bladsygrootteversoenbare modus gebruik word. Stel asseblief weer die app met 16 KB-ondersteuning saam vir beste versoenbaarheid. Sien <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> vir meer inligting"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Hierdie app is nie versoenbaar met 16 KB nie. APK- ELF-belyningkontroles het misluk. Hierdie app sal met bladsygrootteversoenbare modus gebruik word. Stel asseblief weer die app met 16 KB-ondersteuning saam vir beste versoenbaarheid. Sien <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> vir meer inligting"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Diens nie verskaf nie."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Jy kan nie die beller-ID-instelling verander nie."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Het data oorgeskakel na <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -308,7 +305,7 @@ <string name="notification_channel_alerts" msgid="5070241039583668427">"Opletberigte"</string> <string name="notification_channel_retail_mode" msgid="3732239154256431213">"Kleinhandeldemonstrasie"</string> <string name="notification_channel_usb" msgid="1528280969406244896">"USB-verbinding"</string> - <string name="notification_channel_heavy_weight_app" msgid="17455756500828043">"Program loop tans"</string> + <string name="notification_channel_heavy_weight_app" msgid="17455756500828043">"App loop tans"</string> <string name="notification_channel_foreground_service" msgid="7102189948158885178">"Programme wat batterykrag gebruik"</string> <string name="notification_channel_accessibility_magnification" msgid="1707913872219798098">"Vergroting"</string> <string name="notification_channel_accessibility_security_policy" msgid="1727787021725251912">"Toeganklikheidgebruik"</string> @@ -380,13 +377,13 @@ <string name="permlab_install_shortcut" msgid="7451554307502256221">"installeer kortpaaie"</string> <string name="permdesc_install_shortcut" msgid="4476328467240212503">"Stel \'n program in staat om Tuisskerm-kortpaaie by te voeg sonder gebruikerinmenging."</string> <string name="permlab_uninstall_shortcut" msgid="295263654781900390">"deïnstalleer kortpaaie"</string> - <string name="permdesc_uninstall_shortcut" msgid="1924735350988629188">"Laat die program toe om Tuisskerm-kortpaaie te verwyder sonder gebruikerinmenging."</string> + <string name="permdesc_uninstall_shortcut" msgid="1924735350988629188">"Laat die app toe om Tuisskerm-kortpaaie te verwyder sonder gebruikerinmenging."</string> <string name="permlab_processOutgoingCalls" msgid="4075056020714266558">"herlei uitgaande oproepe"</string> <string name="permdesc_processOutgoingCalls" msgid="7833149750590606334">"Laat die program toe om te sien watter nommer tydens \'n uitgaande oproep geskakel word, met die opsie om die oproep na \'n ander nommer te herlei of die oproep heeltemal te beëindig."</string> <string name="permlab_answerPhoneCalls" msgid="4131324833663725855">"antwoord foonoproepe"</string> <string name="permdesc_answerPhoneCalls" msgid="894386681983116838">"Laat die program toe om inkomende foonoproepe te antwoord."</string> <string name="permlab_receiveSms" msgid="505961632050451881">"ontvang teksboodskappe (SMS)"</string> - <string name="permdesc_receiveSms" msgid="1797345626687832285">"Laat die program toe om SMS-boodskappe te ontvang en te verwerk. Dit beteken dat die program boodskappe wat na jou toestel gestuur is, kan monitor of uitvee, sonder dat jy dit gesien het."</string> + <string name="permdesc_receiveSms" msgid="1797345626687832285">"Laat die app toe om SMS-boodskappe te ontvang en te verwerk. Dit beteken dat die app boodskappe wat na jou toestel gestuur is, kan monitor of uitvee, sonder dat jy dit gesien het."</string> <string name="permlab_receiveMms" msgid="4000650116674380275">"ontvang teksboodskappe (MMS)"</string> <string name="permdesc_receiveMms" msgid="958102423732219710">"Laat die program toe om MMS-boodskappe te ontvang en te verwerk. Dit beteken dat die program boodskappe wat na jou toestel gestuur is kan monitor of uitvee, sonder dat jy dit gesien het."</string> <string name="permlab_bindCellBroadcastService" msgid="586746677002040651">"Stuur seluitsendingboodskappe aan"</string> @@ -403,10 +400,10 @@ <string name="permdesc_sendSms" msgid="6757089798435130769">"Laat die program toe om SMS-boodskappe te stuur. Dit kan tot onverwagse heffings lei. Kwaadwillige programme kan jou geld kos deur boodskappe sonder jou bevestiging te stuur."</string> <string name="permlab_readSms" msgid="5164176626258800297">"lees jou teksboodskappe (SMS of MMS)"</string> <string name="permdesc_readSms" product="tablet" msgid="7912990447198112829">"Hierdie program kan alle SMS\'e (teksboodskappe) wat op jou tablet geberg is, lees."</string> - <string name="permdesc_readSms" product="tv" msgid="3054753345758011986">"Hierdie program kan alle SMS- (teks)-boodskappe lees wat op jou Android TV-toestel geberg is."</string> + <string name="permdesc_readSms" product="tv" msgid="3054753345758011986">"Hierdie app kan alle SMS- (teks)-boodskappe lees wat op jou Android TV-toestel geberg is."</string> <string name="permdesc_readSms" product="default" msgid="774753371111699782">"Hierdie program kan alle SMS\'e (teksboodskappe) wat op jou foon geberg is, lees."</string> <string name="permlab_receiveWapPush" msgid="4223747702856929056">"ontvang teksboodskappe (WAP)"</string> - <string name="permdesc_receiveWapPush" msgid="1638677888301778457">"Laat die program toe om WAP-boodskappe te ontvang en te verwerk. Hierdie toestemming sluit ook in dat boodskappe wat na jou toestel gestuur is, gemonitor of uitgevee kan word, sonder dat jy dit gesien het."</string> + <string name="permdesc_receiveWapPush" msgid="1638677888301778457">"Laat die app toe om WAP-boodskappe te ontvang en te verwerk. Hierdie toestemming sluit ook in dat boodskappe wat na jou toestel gestuur is, gemonitor of uitgevee kan word, sonder dat jy dit gesien het."</string> <string name="permlab_getTasks" msgid="7460048811831750262">"haal lopende programme op"</string> <string name="permdesc_getTasks" msgid="7388138607018233726">"Laat die program toe om inligting oor die huidig- en onlangslopende take op te haal. Dit kan moontlik die program toelaat om inligting oor watter programme op die toestel gebruik word, te ontdek."</string> <string name="permlab_manageProfileAndDeviceOwners" msgid="639849495253987493">"bestuur profiel- en toesteleienaars"</string> @@ -416,15 +413,15 @@ <string name="permlab_enableCarMode" msgid="893019409519325311">"aktiveer motormodus"</string> <string name="permdesc_enableCarMode" msgid="56419168820473508">"Laat die program toe om die motormodus te aktiveer."</string> <string name="permlab_killBackgroundProcesses" msgid="6559320515561928348">"maak ander programme toe"</string> - <string name="permdesc_killBackgroundProcesses" msgid="2357013583055434685">"Laat die program toe om agtergrondprosesse van ander programme te beëindig. Dit kan moontlik veroorsaak dat ander programme ophou werk."</string> + <string name="permdesc_killBackgroundProcesses" msgid="2357013583055434685">"Laat die app toe om agtergrondprosesse van ander apps te beëindig. Dit kan moontlik veroorsaak dat ander apps ophou werk."</string> <string name="permlab_systemAlertWindow" msgid="5757218350944719065">"Hierdie program kan bo-op ander programme verskyn"</string> - <string name="permdesc_systemAlertWindow" msgid="1145660714855738308">"Hierdie program kan bokant ander programme of ander dele van die skerm verskyn. Dit kan met normale programgebruik inmeng en die voorkoms van ander programme verander."</string> + <string name="permdesc_systemAlertWindow" msgid="1145660714855738308">"Hierdie app kan bokant ander apps of ander dele van die skerm verskyn. Dit kan met normale appgebruik inmeng en die voorkoms van ander apps verander."</string> <string name="permlab_hideOverlayWindows" msgid="6382697828482271802">"versteek ander apps se oorleggers"</string> <string name="permdesc_hideOverlayWindows" msgid="5660242821651958225">"Hierdie app kan versoek dat die stelsel oorleggers wat oorspronklik van apps af kom, versteek sodat hulle nie bo-op hulle wys nie."</string> <string name="permlab_runInBackground" msgid="541863968571682785">"loop op die agtergrond"</string> <string name="permdesc_runInBackground" msgid="4344539472115495141">"Hierdie program kan op die agtergrond loop. Dit kan die battery vinniger laat pap word."</string> <string name="permlab_useDataInBackground" msgid="783415807623038947">"gebruik data op die agtergrond"</string> - <string name="permdesc_useDataInBackground" msgid="1230753883865891987">"Hierdie program kan data op die agtergrond gebruik. Dit kan die datagebruik vergroot."</string> + <string name="permdesc_useDataInBackground" msgid="1230753883865891987">"Hierdie app kan data op die agtergrond gebruik. Dit kan die datagebruik vergroot."</string> <string name="permlab_schedule_exact_alarm" msgid="6683283918033029730">"Skeduleer handelinge met presiese tydsbesturing"</string> <string name="permdesc_schedule_exact_alarm" msgid="8198009212013211497">"Hierdie app kan werk skeduleer om op ’n gewenste tyd in die toekoms plaas te vind. Dit beteken ook dat die app kan werk wanneer die toestel nie aktief gebruik word nie."</string> <string name="permlab_use_exact_alarm" msgid="348045139777131552">"Skeduleer wekkers of geleentheidonthounotas"</string> @@ -432,7 +429,7 @@ <string name="permlab_persistentActivity" msgid="464970041740567970">"laat program altyd loop"</string> <string name="permdesc_persistentActivity" product="tablet" msgid="6055271149187369916">"Laat die program toe om dele van ditself deurdringend in die geheue te hou. Dit kan geheue wat aan ander programme beskikbaar is, beperk, en die tablet stadiger maak."</string> <string name="permdesc_persistentActivity" product="tv" msgid="6800526387664131321">"Laat die program toe om dele daarvan in die geheue te laat voortbestaan. Dit kan geheue wat vir ander programme beskikbaar is, beperk en sodoende jou Android TV-toestel stadiger maak."</string> - <string name="permdesc_persistentActivity" product="default" msgid="1914841924366562051">"Laat die program toe om dele van ditself deurdringend in die geheue te hou. Dit kan geheue wat aan ander programme beskikbaar is, beperk, en die foon stadiger maak."</string> + <string name="permdesc_persistentActivity" product="default" msgid="1914841924366562051">"Laat die app toe om dele van die app deurdringend in die geheue te hou. Dit kan geheue wat aan ander apps beskikbaar is, beperk, en die foon stadiger maak."</string> <string name="permlab_foregroundService" msgid="1768855976818467491">"laat loop voorgronddiens"</string> <string name="permdesc_foregroundService" msgid="8720071450020922795">"Laat die program toe om van voorgronddienste gebruik te maak."</string> <string name="permlab_foregroundServiceCamera" msgid="7814751737955715297">"gebruik voorgronddienstipe “kamera”"</string> @@ -472,9 +469,9 @@ <string name="permdesc_receiveBootCompleted" product="tv" msgid="4900842256047614307">"Laat die program toe om self te begin sodra die stelsel klaar geselflaai het. Dit kan dalk daartoe lei dat die toestel langer neem om jou Android TV-toestel te begin, en laat die program toe om die hele toestel stadiger te maak deur altyd te loop."</string> <string name="permdesc_receiveBootCompleted" product="default" msgid="7912677044558690092">"Laat die program toe om homself te begin so gou as moontlik nadat die stelsel laai. Dit maak dat dit langer neem vir die foon om te begin, en dit laat die foon toe om die foon stadiger te maak omdat dit altyd loop."</string> <string name="permlab_broadcastSticky" msgid="4552241916400572230">"Stuur klewerige uitsending"</string> - <string name="permdesc_broadcastSticky" product="tablet" msgid="5058486069846384013">"Laat die program toe om taai uitsendings te stuur, wat agterbly nadat die uitsending klaar is. Oormatige gebruik kan die tablet stadig of onstabiel maak deurdat dit te veel geheue gebruik."</string> - <string name="permdesc_broadcastSticky" product="tv" msgid="2338185920171000650">"Laat die program toe om vaste uitsendings wat agterbly nadat die uitsending eindig, te stuur. Oormatige gebruik kan jou Android TV-toestel stadig of onstabiel maak omdat dit veroorsaak dat jou toestel te veel geheue gebruik."</string> - <string name="permdesc_broadcastSticky" product="default" msgid="134529339678913453">"Laat die program toe om taai uitsendings te stuur, wat agterbly nadat die uitsending klaar is. Oormatige gebruik kan die foon stadig of onstabiel maak deurdat dit te veel geheue gebruik."</string> + <string name="permdesc_broadcastSticky" product="tablet" msgid="5058486069846384013">"Laat die app toe om vaste uitsendings te stuur, wat agterbly nadat die uitsending klaar is. Oormatige gebruik kan die tablet stadig of onstabiel maak deurdat dit te veel geheue gebruik."</string> + <string name="permdesc_broadcastSticky" product="tv" msgid="2338185920171000650">"Laat die app toe om vaste uitsendings wat agterbly nadat die uitsending eindig, te stuur. Oormatige gebruik kan jou Android TV-toestel stadig of onstabiel maak omdat dit veroorsaak dat jou toestel te veel geheue gebruik."</string> + <string name="permdesc_broadcastSticky" product="default" msgid="134529339678913453">"Laat die app toe om vaste uitsendings te stuur, wat agterbly nadat die uitsending klaar is. Oormatige gebruik kan die foon stadig of onstabiel maak deurdat dit te veel geheue gebruik."</string> <string name="permlab_readContacts" msgid="8776395111787429099">"lees jou kontakte"</string> <string name="permdesc_readContacts" product="tablet" msgid="6430093481659992692">"Laat die program toe om data te lees oor jou kontakte wat op jou tablet geberg is. Programme sal ook toegang hê tot die rekeninge op jou tablet wat kontakte geskep het. Dit kan rekeninge insluit wat geskep is deur programme wat jy geïnstalleer het. Hierdie toestemming laat programme toe om jou kontakdata te stoor, en kwaadwillige programme kan kontakdata deel sonder dat jy dit weet."</string> <string name="permdesc_readContacts" product="tv" msgid="8400138591135554789">"Laat die program toe om data te lees oor jou kontakte wat op jou Android TV-toestel geberg is. Programme sal ook toegang hê tot die rekeninge op jou Android TV-toestel wat kontakte geskep het. Dit kan rekeninge insluit wat geskep is deur programme wat jy geïnstalleer het. Hierdie toestemming laat programme toe om jou kontakdata te stoor, en kwaadwillige programme kan kontakdata deel sonder dat jy dit weet."</string> @@ -486,7 +483,7 @@ <string name="permlab_readCallLog" msgid="1739990210293505948">"lees oproeprekord"</string> <string name="permdesc_readCallLog" msgid="8964770895425873433">"Hierdie program kan jou oproepgeskiedenis lees."</string> <string name="permlab_writeCallLog" msgid="670292975137658895">"skryf oproeprekord"</string> - <string name="permdesc_writeCallLog" product="tablet" msgid="2657525794731690397">"Laat die program toe om jou tablet se oproeprekord, insluitende data oor inkomende en uitgaande oproepe, te verander. Kwaadwillige programme kan dit gebruik om jou oproeprekord uit te vee of te verander."</string> + <string name="permdesc_writeCallLog" product="tablet" msgid="2657525794731690397">"Laat die app toe om jou tablet se oproeprekord, insluitende data oor inkomende en uitgaande oproepe, te verander. Kwaadwillige apps kan dit gebruik om jou oproeprekord uit te vee of te verander."</string> <string name="permdesc_writeCallLog" product="tv" msgid="3934939195095317432">"Laat die program toe om jou Android TV-toestel se oproeprekord te wysig, insluitend data oor inkomende en uitgaande oproepe. Kwaadwillige programme kan dit gebruik om jou oproeprekord uit te vee of te wysig."</string> <string name="permdesc_writeCallLog" product="default" msgid="5903033505665134802">"Laat die program toe om jou foon se oproeprekord, insluitende data oor inkomende en uitgaande oproepe, te verander. Kwaadwillige programme kan dit gebruik om jou oproeprekord uit te vee of te verander."</string> <string name="permlab_bodySensors" msgid="662918578601619569">"Kry toegang tot liggaamsensordata, soos polsslag, terwyl program gebruik word"</string> @@ -502,7 +499,7 @@ <string name="permdesc_writeCalendar" product="tv" msgid="951246749004952706">"Hierdie program kan kalendergeleenthede op jou Android TV-toestel byvoeg, verwyder of verander. Hierdie program kan boodskappe stuur wat lyk of dit van kalendereienaars af kom of geleenthede verander sonder om hul eienaars in kennis te stel."</string> <string name="permdesc_writeCalendar" product="default" msgid="5416380074475634233">"Hierdie program kan kalendergebeurtenisse op jou foon byvoeg, verwyder of verander. Hierdie program kan boodskappe stuur wat lyk of dit van kalendereienaars af kom of gebeurtenisse verander sonder om hul eienaars in te lig."</string> <string name="permlab_accessLocationExtraCommands" msgid="5162339812057983988">"Kry toegang tot ekstra liggingverskaffer-bevele"</string> - <string name="permdesc_accessLocationExtraCommands" msgid="355369611979907967">"Gee die program toegang tot ekstra liggingverskaffer-bevele. Dit kan die program dalk toelaat om in te meng met die werking van die GPS of ander liggingbronne."</string> + <string name="permdesc_accessLocationExtraCommands" msgid="355369611979907967">"Gee die app toegang tot ekstra liggingverskaffer-bevele. Dit kan die app dalk toelaat om in te meng met die werking van die GPS of ander liggingbronne."</string> <string name="permlab_accessFineLocation" msgid="6426318438195622966">"kry net op die voorgrond toegang tot presiese ligging"</string> <string name="permdesc_accessFineLocation" msgid="6732174080240016335">"Hierdie program kan jou presiese ligging van liggingdienste af kry terwyl die program gebruik word. Liggingdienste vir jou toestel moet aangeskakel wees vir die program om die ligging te kry. Dit kan batterygebruik verhoog."</string> <string name="permlab_accessCoarseLocation" msgid="1561042925407799741">"kry benaderde ligging net op die voorgrond"</string> @@ -525,7 +522,7 @@ <string name="permdesc_camera" msgid="5240801376168647151">"Hierdie program kan met die kamera foto\'s neem en video\'s opneem terwyl die program gebruik word."</string> <string name="permlab_backgroundCamera" msgid="7549917926079731681">"neem foto\'s en video\'s op die agtergrond"</string> <string name="permdesc_backgroundCamera" msgid="1615291686191138250">"Hierdie program kan enige tyd met die kamera foto\'s neem en video\'s opneem."</string> - <string name="permlab_systemCamera" msgid="3642917457796210580">"Gee \'n program of diens toegang tot stelselkameras om foto\'s en video\'s te neem"</string> + <string name="permlab_systemCamera" msgid="3642917457796210580">"Gee \'n app of diens toegang tot stelselkameras om foto\'s en video\'s te neem"</string> <string name="permdesc_systemCamera" msgid="5938360914419175986">"Hierdie bevoorregte of stelselprogram kan enige tyd met \'n stelselkamera foto\'s neem en video\'s opneem. Vereis dat die program ook die android.permission.CAMERA-toestemming het"</string> <string name="permlab_cameraOpenCloseListener" msgid="5548732769068109315">"Laat \'n program of diens toe om terugbeloproepe te ontvang oor kameratoestelle wat oopgemaak of toegemaak word."</string> <string name="permdesc_cameraOpenCloseListener" msgid="2002636131008772908">"Hierdie program kan terugbeloproepe ontvang wanneer enige kameratoestel oopgemaak (deur watter program) of toegemaak word."</string> @@ -548,7 +545,7 @@ <string name="permdesc_callCompanionApp" msgid="8474168926184156261">"Laat die program toe om deurlopende oproepe op die toestel te sien en te beheer. Dit sluit inligting in soos oproepnommers vir oproepe en die toedrag van die oproepe."</string> <string name="permlab_exemptFromAudioRecordRestrictions" msgid="1164725468350759486">"vrygestel van beperkings op oudio-opnames"</string> <string name="permdesc_exemptFromAudioRecordRestrictions" msgid="2425117015896871976">"Stel die program vry van beperkings om oudio op te neem."</string> - <string name="permlab_acceptHandover" msgid="2925523073573116523">"gaan voort met \'n oproep uit \'n ander program"</string> + <string name="permlab_acceptHandover" msgid="2925523073573116523">"gaan voort met \'n oproep uit \'n ander app"</string> <string name="permdesc_acceptHandovers" msgid="7129026180128626870">"Laat die program toe om \'n oproep voort te sit wat in \'n ander program begin is."</string> <string name="permlab_readPhoneNumbers" msgid="5668704794723365628">"lees foonnommers"</string> <string name="permdesc_readPhoneNumbers" msgid="7368652482818338871">"Laat die program toe om toegang tot die toestel se foonnommers te kry."</string> @@ -557,27 +554,27 @@ <string name="permlab_wakeLock" product="tv" msgid="2856941418123343518">"keer dat jou Android TV-toestel slaap"</string> <string name="permlab_wakeLock" product="default" msgid="569409726861695115">"verhoed foon om te slaap"</string> <string name="permdesc_wakeLock" product="automotive" msgid="5995045369683254571">"Laat die program toe om die motorskerm aan te hou."</string> - <string name="permdesc_wakeLock" product="tablet" msgid="2441742939101526277">"Laat die program toe om die tablet te keer om te slaap."</string> - <string name="permdesc_wakeLock" product="tv" msgid="2329298966735118796">"Laat die program toe om te keer dat jou Android TV-toestel slaap."</string> - <string name="permdesc_wakeLock" product="default" msgid="3689523792074007163">"Laat die program toe om die foon te keer om te slaap."</string> + <string name="permdesc_wakeLock" product="tablet" msgid="2441742939101526277">"Laat die app toe om die tablet te keer om te slaap."</string> + <string name="permdesc_wakeLock" product="tv" msgid="2329298966735118796">"Laat die app toe om te keer dat jou Android TV-toestel slaap."</string> + <string name="permdesc_wakeLock" product="default" msgid="3689523792074007163">"Laat die app toe om die foon te keer om te slaap."</string> <string name="permlab_transmitIr" msgid="8077196086358004010">"versend infrarooi"</string> <string name="permdesc_transmitIr" product="tablet" msgid="5884738958581810253">"Laat die program toe om die tablet se infrarooisender te gebruik."</string> - <string name="permdesc_transmitIr" product="tv" msgid="3278506969529173281">"Laat die program toe om jou Android TV-toestel se infrarooisender te gebruik."</string> + <string name="permdesc_transmitIr" product="tv" msgid="3278506969529173281">"Laat die app toe om jou Android TV-toestel se infrarooisender te gebruik."</string> <string name="permdesc_transmitIr" product="default" msgid="8484193849295581808">"Laat die program toe om die foon se infrarooisender te gebruik."</string> <string name="permlab_setWallpaper" msgid="6959514622698794511">"stel muurpapier"</string> - <string name="permdesc_setWallpaper" msgid="2973996714129021397">"Laat die program toe om die stelsel se muurpapier te stel."</string> + <string name="permdesc_setWallpaper" msgid="2973996714129021397">"Laat die app toe om die stelsel se muurpapier te stel."</string> <string name="permlab_accessHiddenProfile" msgid="8607094418491556823">"Kry toegang tot versteekte profiele"</string> <string name="permdesc_accessHiddenProfile" msgid="1543153202481009676">"Laat die app toe om toegang tot versteekte profiele te kry."</string> <string name="permlab_setWallpaperHints" msgid="1153485176642032714">"verstel jou muurpapier se grootte"</string> <string name="permdesc_setWallpaperHints" msgid="6257053376990044668">"Laat die program toe om die stelsel se muurpapier se groottewenke te stel."</string> <string name="permlab_setTimeZone" msgid="7922618798611542432">"stel tydsone"</string> - <string name="permdesc_setTimeZone" product="tablet" msgid="1788868809638682503">"Laat die program toe om die tablet se tydsone te verander."</string> + <string name="permdesc_setTimeZone" product="tablet" msgid="1788868809638682503">"Laat die app toe om die tablet se tydsone te verander."</string> <string name="permdesc_setTimeZone" product="tv" msgid="9069045914174455938">"Laat die program toe om jou Android TV-toestel se tydsone te verander."</string> <string name="permdesc_setTimeZone" product="default" msgid="4611828585759488256">"Laat die program toe om die foon se tydsone te verander."</string> <string name="permlab_getAccounts" msgid="5304317160463582791">"soek rekeninge op die toestel"</string> - <string name="permdesc_getAccounts" product="tablet" msgid="1784452755887604512">"Laat die program toe om die lys van rekeninge wat aan die tablet bekend is, te kry. Dit kan moontlik enige rekeninge wat geskep is deur programme wat jy geïnstalleer het, insluit."</string> + <string name="permdesc_getAccounts" product="tablet" msgid="1784452755887604512">"Laat die app toe om die lys van rekeninge wat aan die tablet bekend is, te kry. Dit kan moontlik enige rekeninge wat geskep is deur apps wat jy geïnstalleer het, insluit."</string> <string name="permdesc_getAccounts" product="tv" msgid="437604680436540822">"Laat die program toe om die lys rekeninge wat aan jou Android TV-toestel bekend is, te kry. Dit kan dalk rekeninge insluit wat geskep is deur programme wat jy geïnstalleer het."</string> - <string name="permdesc_getAccounts" product="default" msgid="2491273043569751867">"Laat die program toe om die lys van rekeninge wat aan die foon bekend is, te kry. Dit kan moontlik enige rekeninge wat geskep is deur programme wat jy geïnstalleer het, insluit."</string> + <string name="permdesc_getAccounts" product="default" msgid="2491273043569751867">"Laat die app toe om die lys van rekeninge wat aan die foon bekend is, te kry. Dit kan moontlik enige rekeninge wat geskep is deur apps wat jy geïnstalleer het, insluit."</string> <string name="permlab_accessNetworkState" msgid="2349126720783633918">"bekyk netwerkverbindings"</string> <string name="permdesc_accessNetworkState" msgid="4394564702881662849">"Laat die program toe om inligting oor netwerkverbindings, soos watter netwerke bestaan en gekoppel is, te sien."</string> <string name="permlab_createNetworkSockets" msgid="3224420491603590541">"verkry volle netwerktoegang"</string> @@ -585,29 +582,29 @@ <string name="permlab_changeNetworkState" msgid="8945711637530425586">"verander netwerkverbinding"</string> <string name="permdesc_changeNetworkState" msgid="649341947816898736">"Laat die program toe om die status van netwerkkonnektiwiteit te verander."</string> <string name="permlab_changeTetherState" msgid="9079611809931863861">"verander verbinde konnektiwiteit"</string> - <string name="permdesc_changeTetherState" msgid="3025129606422533085">"Laat die program toe om die status van verbinde netwerkkonnektiwiteit te verander."</string> + <string name="permdesc_changeTetherState" msgid="3025129606422533085">"Laat die app toe om die status van verbinde netwerkkonnektiwiteit te verander."</string> <string name="permlab_accessWifiState" msgid="5552488500317911052">"bekyk Wi-Fi-verbindings"</string> <string name="permdesc_accessWifiState" msgid="6913641669259483363">"Laat die program toe om inligting oor Wi-Fi-netwerke, soos of Wi-Fi geaktiveer is en die name van gekoppelde Wi-Fi toestelle, te sien."</string> <string name="permlab_changeWifiState" msgid="7947824109713181554">"koppel en ontkoppel van Wi-Fi"</string> <string name="permdesc_changeWifiState" msgid="7170350070554505384">"Laat die program toe om te koppel aan en te ontkoppel van Wi-Fi-toegangspunte en om veranderings aan Wi-Fi-netwerke se toestelopstellings te maak."</string> <string name="permlab_changeWifiMulticastState" msgid="285626875870754696">"laat Wi-Fi-multisendontvangs toe"</string> - <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="191079868596433554">"Laat die program toe om pakkies te ontvang wat met behulp van multisaai-adresse na alle toestelle op \'n Wi-Fi-netwerk gestuur is, nie net jou tablet nie. Dit gebruik meer krag as die nie-multisaaimodus."</string> - <string name="permdesc_changeWifiMulticastState" product="tv" msgid="1336952358450652595">"Laat die program toe om pakkette te ontvang wat met multi-uitsendingadresse na alle toestelle op \'n Wi-Fi-netwerk gestuur is, nie net jou Android TV-toestel nie. Dit gebruik meer krag as nie-multi-uitsendingmodus."</string> + <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="191079868596433554">"Laat die app toe om pakkies te ontvang wat met behulp van multisaai-adresse na alle toestelle op \'n wi-fi-netwerk gestuur is, nie net jou tablet nie. Dit gebruik meer krag as die nie-multisaaimodus."</string> + <string name="permdesc_changeWifiMulticastState" product="tv" msgid="1336952358450652595">"Laat die app toe om pakkette te ontvang wat met multi-uitsendingadresse na alle toestelle op \'n wi-fi-netwerk gestuur is, nie net jou Android TV-toestel nie. Dit gebruik meer krag as nie-multi-uitsendingmodus."</string> <string name="permdesc_changeWifiMulticastState" product="default" msgid="8296627590220222740">"Laat die program toe om pakkies te ontvang wat met behulp van multisaai-adresse na alle toestelle op \'n Wi-Fi-netwerk gestuur is, nie net jou foon nie. Dit gebruik meer krag as die nie-multisaaimodus."</string> <string name="permlab_bluetoothAdmin" msgid="6490373569441946064">"gaan in by Bluetooth-instellings"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="5370837055438574863">"Laat die program toe om die plaaslike Bluetooth-tablet op te stel, en om met afstandbeheer toestelle saam te bind."</string> - <string name="permdesc_bluetoothAdmin" product="tv" msgid="1623992984547014588">"Laat die program toe om Bluetooth op jou Android TV-toestel op te stel, en om afgeleë toestelle te ontdek en met hulle saam te bind."</string> + <string name="permdesc_bluetoothAdmin" product="tv" msgid="1623992984547014588">"Laat die app toe om Bluetooth op jou Android TV-toestel op te stel, en om afgeleë toestelle te ontdek en met hulle saam te bind."</string> <string name="permdesc_bluetoothAdmin" product="default" msgid="7381341743021234863">"Laat die program toe om die plaaslike Bluetooth-foon op te stel en te ontdek en met afgeleë toestelle saam te bind."</string> <string name="permlab_accessWimaxState" msgid="7029563339012437434">"koppel aan en ontkoppel van WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="5372734776802067708">"Laat die program toe om te bepaal of WiMAX geaktiveer is en of enige WiMAX-netwerke gekoppel is."</string> <string name="permlab_changeWimaxState" msgid="6223305780806267462">"verander WiMAX-status"</string> <string name="permdesc_changeWimaxState" product="tablet" msgid="4011097664859480108">"Laat die program toe om die tablet aan WiMAX-netwerke te koppel en daarvan te ontkoppel."</string> <string name="permdesc_changeWimaxState" product="tv" msgid="5373274458799425276">"Laat die program toe om jou Android TV-toestel aan WiMAX-netwerke te koppel en daarvan te ontkoppel."</string> - <string name="permdesc_changeWimaxState" product="default" msgid="1551666203780202101">"Laat die program toe om die foon aan WiMAX-netwerke te koppel en daarvan te ontkoppel."</string> + <string name="permdesc_changeWimaxState" product="default" msgid="1551666203780202101">"Laat die app toe om die foon aan WiMAX-netwerke te koppel en daarvan te ontkoppel."</string> <string name="permlab_bluetooth" msgid="586333280736937209">"bind saam met Bluetooth-toestelle"</string> - <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"Laat die program toe om die opstelling van Bluetooth op die tablet te sien, en om verbindings met saamgebinde toestelle te maak en te aanvaar."</string> + <string name="permdesc_bluetooth" product="tablet" msgid="3053222571491402635">"Laat die app toe om die opstelling van Bluetooth op die tablet te sien, en om verbindings met saamgebinde toestelle te maak en te aanvaar."</string> <string name="permdesc_bluetooth" product="tv" msgid="8851534496561034998">"Laat die program toe om die opstelling van Bluetooth op jou Android TV-toestel te bekyk, en om verbindings met saamgebinde toestelle te maak en te aanvaar."</string> - <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"Laat die program toe om die opstelling van die Bluetooth op die foon te sien, en om verbindings met saamgebinde toestelle te maak en te aanvaar."</string> + <string name="permdesc_bluetooth" product="default" msgid="2779606714091276746">"Laat die app toe om die opstelling van die Bluetooth op die foon te sien, en om verbindings met saamgebinde toestelle te maak en te aanvaar."</string> <string name="permlab_bluetooth_scan" msgid="5402587142833124594">"ontdek en bind Bluetooth-toestelle in die omtrek saam"</string> <string name="permdesc_bluetooth_scan" product="default" msgid="6540723536925289276">"Laat die program toe om Bluetooth-toestelle in die omtrek te ontdek en saam te bind"</string> <string name="permlab_bluetooth_connect" msgid="6657463246355003528">"koppel aan saamgebinde Bluetooth-toestelle"</string> @@ -627,9 +624,9 @@ <string name="permlab_nfcTransactionEvent" msgid="5868209446710407679">"Veilige Element-transaksiegeval"</string> <string name="permdesc_nfcTransactionEvent" msgid="1904286701876487397">"Laat die app toe om inligting te ontvang oor transaksies wat op ’n Veilige Element plaasvind."</string> <string name="permlab_disableKeyguard" msgid="3605253559020928505">"deaktiveer jou skermslot"</string> - <string name="permdesc_disableKeyguard" msgid="3223710003098573038">"Laat die program toe om die sleutelslot en enige verwante wagwoordsekuriteit te deaktiveer. Byvoorbeeld, die foon deaktiveer die sleutelslot wanneer ’n oproep inkom, en atkiveer dit dan weer wanneer die oproep eindig."</string> + <string name="permdesc_disableKeyguard" msgid="3223710003098573038">"Laat die app toe om die sleutelslot en enige verwante wagwoordsekuriteit te deaktiveer. Byvoorbeeld, die foon deaktiveer die sleutelslot wanneer ’n oproep inkom, en aktiveer dit dan weer wanneer die oproep eindig."</string> <string name="permlab_requestPasswordComplexity" msgid="1808977190557794109">"versoek skermslot-kompleksiteit"</string> - <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Laat die program toe om die skermslot-kompleksiteitvlak (hoog, medium, laag of geen) te leer, wat die moontlike omvang van die lengte en soort skermslot aandui. Hierdie program kan ook aan gebruikers voorstel dat hulle die skermslot na \'n sekere vlak opdateer, maar gebruikers kan dit uit vrye wil ignoreer en weggaan. Let daarop dat die skermslot nie in skoonteks geberg word nie en die program dus nie die presiese wagwoord ken nie."</string> + <string name="permdesc_requestPasswordComplexity" msgid="1130556896836258567">"Laat die app toe om die skermslot-kompleksiteitvlak (hoog, medium, laag of geen) te leer, wat die moontlike omvang van die lengte en soort skermslot aandui. Hierdie app kan ook aan gebruikers voorstel dat hulle die skermslot na \'n sekere vlak opdateer, maar gebruikers kan dit uit vrye wil ignoreer en weggaan. Let daarop dat die skermslot nie in skoonteks geberg word nie en die app dus nie die presiese wagwoord ken nie."</string> <string name="permlab_postNotification" msgid="4875401198597803658">"wys kennisgewings"</string> <string name="permdesc_postNotification" msgid="5974977162462877075">"Laat die program toe om kennisgewings te wys"</string> <string name="permlab_turnScreenOn" msgid="219344053664171492">"skakel die skerm aan"</string> @@ -637,7 +634,7 @@ <string name="permlab_useBiometric" msgid="6314741124749633786">"gebruik biometriese hardeware"</string> <string name="permdesc_useBiometric" msgid="7502858732677143410">"Laat die program toe om biometriese hardeware vir stawing te gebruik"</string> <string name="permlab_manageFingerprint" msgid="7432667156322821178">"bestuur vingerafdrukhardeware"</string> - <string name="permdesc_manageFingerprint" msgid="2025616816437339865">"Laat die program toe om metodes te benut om vingerafdruksjablone vir gebruik by te voeg en uit te vee."</string> + <string name="permdesc_manageFingerprint" msgid="2025616816437339865">"Laat die app toe om metodes te benut om vingerafdruktemplate vir gebruik by te voeg en uit te vee."</string> <string name="permlab_useFingerprint" msgid="1001421069766751922">"gebruik vingerafdrukhardeware"</string> <string name="permdesc_useFingerprint" msgid="412463055059323742">"Laat die program toe om vingerafdrukhardeware vir stawing te gebruik"</string> <string name="permlab_audioWrite" msgid="8501705294265669405">"wysig jou musiekversameling"</string> @@ -765,7 +762,7 @@ <string name="face_error_vendor_unknown" msgid="7387005932083302070">"Iets is fout. Probeer weer."</string> <string name="face_icon_content_description" msgid="465030547475916280">"Gesig-ikoon"</string> <string name="permlab_readSyncSettings" msgid="6250532864893156277">"lees sinkroniseer-instellings"</string> - <string name="permdesc_readSyncSettings" msgid="1325658466358779298">"Laat die program toe om die sinkroniseringinstellings van \'n rekening te lees. Byvoorbeeld, dit kan bepaal of die People-program met \'n rekening gesinkroniseer is."</string> + <string name="permdesc_readSyncSettings" msgid="1325658466358779298">"Laat die app toe om die sinkroniseringinstellings van \'n rekening te lees. Byvoorbeeld, dit kan bepaal of die People-app met \'n rekening gesinkroniseer is."</string> <string name="permlab_writeSyncSettings" msgid="6583154300780427399">"wissel tussen sinkronisasie aan en af"</string> <string name="permdesc_writeSyncSettings" msgid="6029151549667182687">"Laat \'n program toe om die sinkroniseringinstellings van \'n rekening te verander. Byvoorbeeld, dit kan gebruik word om sinkronisasie van die People-program met \'n ander rekening te aktiveer."</string> <string name="permlab_readSyncStats" msgid="3747407238320105332">"lees sinkroniseerstatistiek"</string> @@ -783,13 +780,13 @@ <string name="permlab_sdcardWrite" msgid="4863021819671416668">"verander of vee jou gedeelde berging se inhoud uit"</string> <string name="permdesc_sdcardWrite" msgid="8376047679331387102">"Laat die program toe om jou gedeelde berging se inhoud te skryf."</string> <string name="permlab_use_sip" msgid="8250774565189337477">"maak en/of ontvang SIP-oproepe"</string> - <string name="permdesc_use_sip" msgid="3590270893253204451">"Laat die program toe om SIP-oproepe te maak en te ontvang."</string> + <string name="permdesc_use_sip" msgid="3590270893253204451">"Laat die app toe om SIP-oproepe te maak en te ontvang."</string> <string name="permlab_register_sim_subscription" msgid="1653054249287576161">"registreer nuwe telekommunikasie-SIM-verbindings"</string> <string name="permdesc_register_sim_subscription" msgid="4183858662792232464">"Laat die program toe om nuwe telekommunikasie-SIM-verbindings te registreer."</string> <string name="permlab_register_call_provider" msgid="6135073566140050702">"registreer nuwe telekommunikasieverbindings"</string> <string name="permdesc_register_call_provider" msgid="4201429251459068613">"Laat die program toe om nuwe telekommunikasieverbindings te registreer."</string> <string name="permlab_connection_manager" msgid="3179365584691166915">"bestuur telekom-verbindings"</string> - <string name="permdesc_connection_manager" msgid="1426093604238937733">"Laat die program toe om telekom-verbindings te bestuur."</string> + <string name="permdesc_connection_manager" msgid="1426093604238937733">"Laat die app toe om telekom-verbindings te bestuur."</string> <string name="permlab_bind_incall_service" msgid="5990625112603493016">"beleef interaksie met inoproep-skerm"</string> <string name="permdesc_bind_incall_service" msgid="4124917526967765162">"Laat die program beheer wanneer en hoe die gebruiker die inoproep-skerm sien."</string> <string name="permlab_bind_connection_service" msgid="5409268245525024736">"werk met telefoniedienste saam"</string> @@ -797,9 +794,9 @@ <string name="permlab_control_incall_experience" msgid="6436863486094352987">"bied \'n inoproep-gebruikerervaring"</string> <string name="permdesc_control_incall_experience" msgid="5896723643771737534">"Laat die program toe om \'n inoproep-gebruikerervaring te bied."</string> <string name="permlab_readNetworkUsageHistory" msgid="8470402862501573795">"lees netwerkgebruik-geskiedenis"</string> - <string name="permdesc_readNetworkUsageHistory" msgid="1112962304941637102">"Laat die program toe om historiese netwerkgebruik vir spesifieke netwerke en programme te lees."</string> + <string name="permdesc_readNetworkUsageHistory" msgid="1112962304941637102">"Laat die app toe om historiese netwerkgebruik vir spesifieke netwerke en apps te lees."</string> <string name="permlab_manageNetworkPolicy" msgid="6872549423152175378">"bestuur netwerkbeleid"</string> - <string name="permdesc_manageNetworkPolicy" msgid="1865663268764673296">"Laat die program toe om netwerkbeleide te bestuur en program-spesifieke reëls te definieer."</string> + <string name="permdesc_manageNetworkPolicy" msgid="1865663268764673296">"Laat die app toe om netwerkbeleide te bestuur en app-spesifieke reëls te definieer."</string> <string name="permlab_modifyNetworkAccounting" msgid="7448790834938749041">"verander verrekening van netwerkgebruik"</string> <string name="permdesc_modifyNetworkAccounting" msgid="5076042642247205390">"Laat die program toe om te verander hoe netwerkgebruik teenoor programme gemeet word. Nie vir gebruik deur normale programme nie."</string> <string name="permlab_accessNotifications" msgid="7130360248191984741">"kry toegang tot kennisgewings"</string> @@ -813,9 +810,9 @@ <string name="permlab_invokeCarrierSetup" msgid="5098810760209818140">"roep die opstellingprogram op wat deur die diensverskaffer voorsien is"</string> <string name="permdesc_invokeCarrierSetup" msgid="4790845896063237887">"Laat die houer toe om die opstellingsprogram wat deur die diensverskaffer voorsien word, op te roep. Behoort nooit vir gewone programme nodig te wees nie."</string> <string name="permlab_accessNetworkConditions" msgid="1270732533356286514">"luister vir waarnemings oor netwerktoestande"</string> - <string name="permdesc_accessNetworkConditions" msgid="2959269186741956109">"Laat \'n program luister vir waarnemings oor netwerktoestande. Behoort nooit nodig te wees vir normale programme nie."</string> + <string name="permdesc_accessNetworkConditions" msgid="2959269186741956109">"Laat \'n app luister vir waarnemings oor netwerktoestande. Dit behoort nooit vir normale apps nodig te wees nie."</string> <string name="permlab_setInputCalibration" msgid="932069700285223434">"verander invoertoestelkalibrasie"</string> - <string name="permdesc_setInputCalibration" msgid="2937872391426631726">"Laat die program toe om die kalibrasieparameters van die raakskerm te wysig. Dit behoort nooit vir normale programme nodig te wees nie."</string> + <string name="permdesc_setInputCalibration" msgid="2937872391426631726">"Laat die app toe om die kalibrasieparameters van die raakskerm te wysig. Dit behoort nooit vir normale apps nodig te wees nie."</string> <string name="permlab_accessDrmCertificates" msgid="6473765454472436597">"gaan in by DRM-sertifikate"</string> <string name="permdesc_accessDrmCertificates" msgid="6983139753493781941">"Laat \'n program toe om DRM-sertifikate op te stel en te gebruik. Behoort nooit vir normale programme nodig te wees nie."</string> <string name="permlab_handoverStatus" msgid="7620438488137057281">"ontvang Android Straal-oordragstatus"</string> @@ -829,7 +826,7 @@ <string name="permlab_access_notification_policy" msgid="5524112842876975537">"verkry toegang tot Moenie Steur Nie"</string> <string name="permdesc_access_notification_policy" msgid="8538374112403845013">"Laat die program toe om Moenie Steur Nie-opstelling te lees en skryf."</string> <string name="permlab_startViewPermissionUsage" msgid="1504564328641112341">"begin kyk van toestemminggebruik"</string> - <string name="permdesc_startViewPermissionUsage" msgid="2820325605959586538">"Laat die houer toe om die toestemminggebruik vir \'n program te begin. Behoort nooit vir normale programme nodig te wees nie."</string> + <string name="permdesc_startViewPermissionUsage" msgid="2820325605959586538">"Laat die houer toe om die toestemminggebruik vir \'n app te begin. Dit behoort nooit vir normale apps nodig te wees nie."</string> <string name="permlab_startReviewPermissionDecisions" msgid="8690578688476599284">"begin Bekyk Toestemmingbesluite"</string> <string name="permdesc_startReviewPermissionDecisions" msgid="2775556853503004236">"Laat die houer toe om skerm te begin om toestemmingbesluite na te gaan. Behoort nooit vir normale programme nodig te wees nie."</string> <string name="permlab_startViewAppFeatures" msgid="7955084203185903001">"begin Bekyk Programkenmerke"</string> @@ -989,7 +986,7 @@ <string name="sipAddressTypeHome" msgid="5918441930656878367">"Tuis"</string> <string name="sipAddressTypeWork" msgid="7873967986701216770">"Werk"</string> <string name="sipAddressTypeOther" msgid="6317012577345187275">"Ander"</string> - <string name="quick_contacts_not_available" msgid="1262709196045052223">"Geen program gekry om hierdie kontak te bekyk nie."</string> + <string name="quick_contacts_not_available" msgid="1262709196045052223">"Geen app gekry om hierdie kontak te bekyk nie."</string> <string name="keyguard_password_enter_pin_code" msgid="6401406801060956153">"Voer PIN-kode in"</string> <string name="keyguard_password_enter_puk_code" msgid="3112256684547584093">"Voer PUK en nuwe PIN-kode in"</string> <string name="keyguard_password_enter_puk_prompt" msgid="2825313071899938305">"PUK-kode"</string> @@ -1107,7 +1104,7 @@ <string name="js_dialog_before_unload" msgid="7213364985774778744">"<xliff:g id="MESSAGE">%s</xliff:g>\n\nIs jy seker dat jy weg van hierdie bladsy af wil navigeer?"</string> <string name="autofill_window_title" msgid="4379134104008111961">"Outovul met <xliff:g id="SERVICENAME">%1$s</xliff:g>"</string> <string name="permlab_setAlarm" msgid="1158001610254173567">"stel \'n wekker"</string> - <string name="permdesc_setAlarm" msgid="2185033720060109640">"Laat die program toe om \'n alarm in \'n geïnstalleerde wekkerprogram te stel. Sommige wekkerprogramme werk dalk nie met hierdie funksie nie."</string> + <string name="permdesc_setAlarm" msgid="2185033720060109640">"Laat die app toe om \'n alarm in \'n geïnstalleerde wekkerapp te stel. Sommige wekkerapps werk dalk nie met hierdie funksie nie."</string> <string name="permlab_addVoicemail" msgid="4770245808840814471">"voeg stemboodskap by"</string> <string name="permdesc_addVoicemail" msgid="5470312139820074324">"Laat die program toe om boodskappe by te voeg by jou stempos-inkassie."</string> <string name="pasted_from_clipboard" msgid="7355790625710831847">"<xliff:g id="PASTING_APP_NAME">%1$s</xliff:g> het van jou knipbord af geplak"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"oor <xliff:g id="COUNT">%d</xliff:g> u."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"oor <xliff:g id="COUNT">%d</xliff:g> d."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"oor <xliff:g id="COUNT">%d</xliff:g> j."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minuut gelede}other{# minute gelede}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# uur gelede}other{# uur gelede}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# dag gelede}other{# dae gelede}}"</string> @@ -1253,13 +1282,13 @@ <string name="use_a_different_app" msgid="4987790276170972776">"Gebruik \'n ander program"</string> <string name="clearDefaultHintMsg" msgid="1325866337702524936">"Vee die verstek instelling uit in Stelselinstellings > Programme > Afgelaai."</string> <string name="chooseActivity" msgid="8563390197659779956">"Kies \'n handeling"</string> - <string name="chooseUsbActivity" msgid="2096269989990986612">"Kies \'n program vir die USB-toestel"</string> + <string name="chooseUsbActivity" msgid="2096269989990986612">"Kies \'n app vir die USB-toestel"</string> <string name="noApplications" msgid="1186909265235544019">"Geen programme kan hierdie handeling uitvoer nie."</string> <string name="aerr_application" msgid="4090916809370389109">"<xliff:g id="APPLICATION">%1$s</xliff:g> het gestop"</string> <string name="aerr_process" msgid="4268018696970966407">"<xliff:g id="PROCESS">%1$s</xliff:g> het gestop"</string> <string name="aerr_application_repeated" msgid="7804378743218496566">"<xliff:g id="APPLICATION">%1$s</xliff:g> stop aanhoudend"</string> <string name="aerr_process_repeated" msgid="1153152413537954974">"<xliff:g id="PROCESS">%1$s</xliff:g> stop aanhoudend"</string> - <string name="aerr_restart" msgid="2789618625210505419">"Maak program weer oop"</string> + <string name="aerr_restart" msgid="2789618625210505419">"Maak app weer oop"</string> <string name="aerr_report" msgid="3095644466849299308">"Stuur terugvoer"</string> <string name="aerr_close" msgid="3398336821267021852">"Maak toe"</string> <string name="aerr_mute" msgid="2304972923480211376">"Demp totdat toestel herbegin"</string> @@ -1317,7 +1346,7 @@ <string name="dump_heap_ready_notification" msgid="2302452262927390268">"<xliff:g id="PROC">%1$s</xliff:g>-hoopstorting is gereed"</string> <string name="dump_heap_notification_detail" msgid="8431586843001054050">"Hoopstorting is ingesamel. Tik om te deel."</string> <string name="dump_heap_title" msgid="4367128917229233901">"Deel hoopstorting?"</string> - <string name="dump_heap_text" msgid="1692649033835719336">"Die <xliff:g id="PROC">%1$s</xliff:g>-proses het sy geheuelimiet van <xliff:g id="SIZE">%2$s</xliff:g> oorskry. \'n Hoopstorting is beskikbaar wat jy met sy ontwikkelaar kan deel. Pas op: Hierdie hoopstorting bevat dalk van jou persoonlike inligting waartoe die program toegang het."</string> + <string name="dump_heap_text" msgid="1692649033835719336">"Die <xliff:g id="PROC">%1$s</xliff:g>-proses het sy geheuelimiet van <xliff:g id="SIZE">%2$s</xliff:g> oorskry. \'n Hoopstorting is beskikbaar wat jy met sy ontwikkelaar kan deel. Pas op: Hierdie hoopstorting bevat dalk van jou persoonlike inligting waartoe die app toegang het."</string> <string name="dump_heap_system_text" msgid="6805155514925350849">"Die <xliff:g id="PROC">%1$s</xliff:g>-proses het sy geheuelimiet van <xliff:g id="SIZE">%2$s</xliff:g> oorskry. \'n Hoopstorting is beskikbaar wat jy kan deel. Wees versigtig: Hierdie hoopstorting kan enige sensitiewe persoonlike inligting bevat waarby die proses kan ingaan, wat goed kan insluit wat jy getik het."</string> <string name="dump_heap_ready_text" msgid="5849618132123045516">"\'n Hoopstorting van <xliff:g id="PROC">%1$s</xliff:g> se proses is beskikbaar vir jou om te deel. Wees versigtig: Hierdie hoopstorting kan sensitiewe persoonlike inligting bevat waarby die proses kan ingaan, wat goed kan insluit wat jy getik het."</string> <string name="sendText" msgid="493003724401350724">"Kies \'n handeling vir teks"</string> @@ -1502,7 +1531,7 @@ <string name="ext_media_status_missing" msgid="6520746443048867314">"Nie ingevoeg nie"</string> <string name="activity_list_empty" msgid="4219430010716034252">"Geen passende aktiwiteite gevind nie."</string> <string name="permlab_route_media_output" msgid="8048124531439513118">"roeteer media-uitvoer"</string> - <string name="permdesc_route_media_output" msgid="1759683269387729675">"Laat \'n program toe om media-uitvoere na ander eksterne toestelle te roeteer."</string> + <string name="permdesc_route_media_output" msgid="1759683269387729675">"Laat \'n app toe om media-uitvoere na ander eksterne toestelle te roeteer."</string> <string name="permlab_readInstallSessions" msgid="7279049337895583621">"lees installeersessies"</string> <string name="permdesc_readInstallSessions" msgid="4012608316610763473">"Laat \'n program toe om installasiesessies te lees. Dit laat dit toe om besonderhede van aktiewe pakketinstallasies te sien."</string> <string name="permlab_requestInstallPackages" msgid="7600020863445351154">"versoek installeerpakkette"</string> @@ -1533,7 +1562,7 @@ <string name="permission_request_notification_with_subtitle" msgid="3743417870360129298">"Toestemming versoek\nvir rekening <xliff:g id="ACCOUNT">%s</xliff:g>."</string> <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"Toestemming versoek deur <xliff:g id="APP">%1$s</xliff:g>\nvir rekening <xliff:g id="ACCOUNT">%2$s</xliff:g>"</string> <string name="forward_intent_to_owner" msgid="4620359037192871015">"Jy gebruik hierdie program buite jou werkprofiel"</string> - <string name="forward_intent_to_work" msgid="3620262405636021151">"Jy gebruik tans hierdie program in jou werkprofiel"</string> + <string name="forward_intent_to_work" msgid="3620262405636021151">"Jy gebruik tans hierdie app in jou werkprofiel"</string> <string name="input_method_binding_label" msgid="1166731601721983656">"Invoermetode"</string> <string name="sync_binding_label" msgid="469249309424662147">"Sinkroniseer"</string> <string name="accessibility_binding_label" msgid="1974602776545801715">"Toeganklikheid"</string> @@ -1609,7 +1638,7 @@ <string name="keyboardview_keycode_mode_change" msgid="2743735349997999020">"Modus verander"</string> <string name="keyboardview_keycode_shift" msgid="3026509237043975573">"Shift"</string> <string name="keyboardview_keycode_enter" msgid="168054869339091055">"Invoersleutel"</string> - <string name="activitychooserview_choose_application" msgid="3500574466367891463">"Kies \'n program"</string> + <string name="activitychooserview_choose_application" msgid="3500574466367891463">"Kies \'n app"</string> <string name="activitychooserview_choose_application_error" msgid="6937782107559241734">"Kon <xliff:g id="APPLICATION_NAME">%s</xliff:g> nie begin nie"</string> <string name="shareactionprovider_share_with" msgid="2753089758467748982">"Deel met"</string> <string name="shareactionprovider_share_with_application" msgid="4902832247173666973">"Deel met <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> @@ -1782,7 +1811,7 @@ <string name="guest_name" msgid="8502103277839834324">"Gas"</string> <string name="error_message_title" msgid="4082495589294631966">"Fout"</string> <string name="error_message_change_not_allowed" msgid="843159705042381454">"Jou administrateur laat nie hierdie verandering toe nie"</string> - <string name="app_not_found" msgid="3429506115332341800">"Geen program gevind om hierdie handeling te hanteer nie"</string> + <string name="app_not_found" msgid="3429506115332341800">"Geen app gevind om hierdie handeling te hanteer nie"</string> <string name="revoke" msgid="5526857743819590458">"Herroep"</string> <string name="mediasize_iso_a0" msgid="7039061159929977973">"ISO A0"</string> <string name="mediasize_iso_a1" msgid="4063589931031977223">"ISO A1"</string> @@ -2049,7 +2078,7 @@ <string name="deprecated_target_sdk_app_store" msgid="8456784048558808909">"Kyk vir opdatering"</string> <string name="deprecated_abi_message" msgid="6820548011196218091">"Hierdie app is nie met die jongste weergawe van Android versoenbaar nie. Kyk of daar ’n opdatering is, of kontak die app se ontwikkelaar."</string> <string name="new_sms_notification_title" msgid="6528758221319927107">"Jy het nuwe boodskappe"</string> - <string name="new_sms_notification_content" msgid="3197949934153460639">"Maak SMS-program oop om te bekyk"</string> + <string name="new_sms_notification_content" msgid="3197949934153460639">"Maak SMS-app oop om te bekyk"</string> <string name="profile_encrypted_title" msgid="9001208667521266472">"Sommige funksies kan beperk wees"</string> <string name="profile_encrypted_detail" msgid="5279730442756849055">"Werkprofiel is gesluit"</string> <string name="profile_encrypted_message" msgid="1128512616293157802">"Tik om werkprofiel te ontsluit"</string> @@ -2171,7 +2200,7 @@ <string name="battery_saver_charged_notification_summary" product="tablet" msgid="4426317048139996888">"Tablet se battery het genoeg krag. Kenmerke is nie meer beperk nie."</string> <string name="battery_saver_charged_notification_summary" product="device" msgid="1031562417867646649">"Toestel se battery het genoeg krag. Kenmerke is nie meer beperk nie."</string> <string name="mime_type_folder" msgid="2203536499348787650">"Vouer"</string> - <string name="mime_type_apk" msgid="3168784749499623902">"Android-program"</string> + <string name="mime_type_apk" msgid="3168784749499623902">"Android-app"</string> <string name="mime_type_generic" msgid="4606589110116560228">"Lêer"</string> <string name="mime_type_generic_ext" msgid="9220220924380909486">"<xliff:g id="EXTENSION">%1$s</xliff:g>-lêer"</string> <string name="mime_type_audio" msgid="4933450584432509875">"Oudio"</string> @@ -2193,7 +2222,7 @@ <string name="file_count" msgid="3220018595056126969">"{count,plural, =1{{file_name} + # lêer}other{{file_name} + # lêers}}"</string> <string name="chooser_no_direct_share_targets" msgid="1511722103987329028">"Geen mense om mee te deel is aanbeveel nie"</string> <string name="chooser_all_apps_button_label" msgid="3230427756238666328">"Programmelys"</string> - <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Opneemtoestemming is nie aan hierdie program verleen nie, maar dit kan oudio deur hierdie USB-toestel opneem."</string> + <string name="usb_device_resolve_prompt_warn" msgid="325871329788064199">"Opneemtoestemming is nie aan hierdie app verleen nie, maar dit kan oudio deur hierdie USB-toestel opneem."</string> <string name="accessibility_system_action_home_label" msgid="3234748160850301870">"Tuis"</string> <string name="accessibility_system_action_back_label" msgid="4205361367345537608">"Terug"</string> <string name="accessibility_system_action_recents_label" msgid="4782875610281649728">"Onlangse programme"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index dcb7186e6f5c..ad5bbcbb8cbe 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"የደዋይ ID ወደ ተከልክሏል ነባሪዎች።ቀጥሎ ጥሪ፡ አልተከለከለም"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"የደዋይ ID ወደ አልተከለከለም ነባሪዎች።ቀጥሎ ጥሪ፡ ተከልክሏል"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"የደዋይ ID ነባሪዎች ወደአልተከለከለም። ቀጥሎ ጥሪ፡አልተከለከለም"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"ይህ መተግበሪያ ለ16 ኪባ ተኳዃኝ አይደለም። የኤፒኬ አሰላለፍ ፍተሻ አልተሳካም። ይህ መተግበሪያ የገፅ መጠን ተኳዃኝ ሁነታን በመጠቀም ይሄዳል። ለምርጥ ተኳዃኝነት እባክዎ መተግበሪያውን በ16 ኪባ ድጋፍ እንደገና ያጠናቅሩ። ለተጨማሪ መረጃ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> የሚለውን ይመልከቱ"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"ይህ መተግበሪያ ለ16 ኪባ ተኳዃኝ አይደለም። የELF አሰላለፍ ፍተሻ አልተሳካም። ይህ መተግበሪያ የገፅ መጠን ተኳዃኝ ሁነታን በመጠቀም ይሄዳል። ለምርጥ ተኳዃኝነት እባክዎ መተግበሪያውን በ16 ኪባ ድጋፍ እንደገና ያጠናቅሩ። ለተጨማሪ መረጃ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> የሚለውን ይመልከቱ"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"ይህ መተግበሪያ ለ16 ኪባ ተኳዃኝ አይደለም። ኤፒኬ እና ELF አሰላለፍ ፍተሻዎች አልተሳኩም። ይህ መተግበሪያ የገፅ መጠን ተኳዃኝ ሁነታን በመጠቀም ይሄዳል። ለምርጥ ተኳዃኝነት እባክዎ መተግበሪያውን በ16 ኪባ ድጋፍ እንደገና ያጠናቅሩ። ለተጨማሪ መረጃ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> የሚለውን ይመልከቱ"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"አገልግሎት አልቀረበም።"</string> <string name="CLIRPermanent" msgid="166443681876381118">"የደዋይ መታወቂያ ቅንብሮች መለወጥ አትችልም፡፡"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"ውሂብ ወደ <xliff:g id="CARRIERDISPLAY">%s</xliff:g> ተቀይሯል"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"በ<xliff:g id="COUNT">%d</xliff:g> ሰ ውስጥ"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"በ<xliff:g id="COUNT">%d</xliff:g> ቀ ውስጥ"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"በ<xliff:g id="COUNT">%d</xliff:g> ዓ ውስጥ"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{ከ# ደቂቃ በፊት}one{# ደቂቃ በፊት}other{# ደቂቃዎች በፊት}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{ከ# ሰዓት በፊት}one{ከ# ሰዓት በፊት}other{ከ# ሰዓታት በፊት}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{ከ# ቀን በፊት}one{ከ# ቀን በፊት}other{ከ# ቀናት በፊት}}"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 9c590ad25bbc..8cb64c5712f8 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1162,6 +1162,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"خلال <xliff:g id="COUNT">%d</xliff:g> ساعة"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"خلال <xliff:g id="COUNT">%d</xliff:g> يوم"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"خلال <xliff:g id="COUNT">%d</xliff:g> سنة"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{قبل دقيقة واحدة}zero{قبل # دقيقة}two{قبل دقيقتين}few{قبل # دقائق}many{قبل # دقيقة}other{قبل # دقيقة}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{قبل ساعة واحدة}zero{قبل # ساعة}two{قبل ساعتين}few{قبل # ساعات}many{قبل # ساعة}other{قبل # ساعة}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{قبل يوم واحد}zero{قبل # يوم}two{قبل يومين}few{قبل # أيام}many{قبل # يومًا}other{قبل # يوم}}"</string> diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml index 319cf4bd316b..4214ebee2e47 100644 --- a/core/res/res/values-as/strings.xml +++ b/core/res/res/values-as/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"কলাৰ আইডি সীমিত কৰিবলৈ পূর্বনির্ধাৰণ কৰা হৈছে। পৰৱৰ্তী কল: সীমিত কৰা হৈছে"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"কলাৰ আইডি সীমিত নকৰিবলৈ পূর্বনির্ধাৰণ কৰা হৈছে। পৰৱৰ্তী কল: সীমিত কৰা হোৱা নাই"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"কলাৰ আইডি সীমিত নকৰিবলৈ পূর্বনির্ধাৰণ কৰা হৈছে। পৰৱৰ্তী কল: সীমিত কৰা হোৱা নাই"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"এই এপ্টো ১৬ কেবিৰ সমিল নহয়। APKৰ শাৰীবিন্যাস পৰীক্ষা বিফল হৈছে। এই এপ্টো পৃষ্ঠাৰ আকাৰৰ সমিল ম’ড ব্যৱহাৰ কৰি চলোৱা হ’ব। উত্তম সমিলতাৰ বাবে, অনুগ্ৰহ কৰি এপ্লিকেশ্বনটো ১৬ কেবিৰ সমৰ্থনৰ সৈতে পুনৰায় কম্পাইল কৰক। অধিক তথ্যৰ বাবে, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>লৈ যাওক"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"এই এপ্টো ১৬ কেবিৰ সমিল নহয়। ELFৰ শাৰীবিন্যাস পৰীক্ষা বিফল হৈছে। এই এপ্টো পৃষ্ঠাৰ আকাৰৰ সমিল ম’ড ব্যৱহাৰ কৰি চলোৱা হ’ব। উত্তম সমিলতাৰ বাবে, অনুগ্ৰহ কৰি এপ্লিকেশ্বনটো ১৬ কেবিৰ সমৰ্থনৰ সৈতে পুনৰায় কম্পাইল কৰক। অধিক তথ্যৰ বাবে, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>লৈ যাওক"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"এই এপ্টো ১৬ কেবিৰ সমিল নহয়। APK আৰু ELFৰ শাৰীবিন্যাস পৰীক্ষা বিফল হৈছে। এই এপ্টো পৃষ্ঠাৰ আকাৰৰ সমিল ম’ড ব্যৱহাৰ কৰি চলোৱা হ’ব। উত্তম সমিলতাৰ বাবে, অনুগ্ৰহ কৰি এপ্লিকেশ্বনটো ১৬ কেবিৰ সমৰ্থনৰ সৈতে পুনৰায় কম্পাইল কৰক। অধিক তথ্যৰ বাবে, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>লৈ যাওক"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"সুবিধা যোগান ধৰা হোৱা নাই।"</string> <string name="CLIRPermanent" msgid="166443681876381118">"আপুনি কলাৰ আইডি ছেটিং সলনি কৰিব নোৱাৰে।"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"ডেটা <xliff:g id="CARRIERDISPLAY">%s</xliff:g>লৈ সলনি কৰা হৈছে"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> ঘণ্টাত"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g>দিনত"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> বছৰত"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# মিনিট পূৰ্বে}one{# মিনিট পূৰ্বে}other{# মিনিট পূৰ্বে}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ঘণ্টা পূৰ্বে}one{# ঘণ্টা পূৰ্বে}other{# ঘণ্টা পূৰ্বে}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# দিন পূর্বে}one{# দিন পূৰ্বে}other{# দিন পূৰ্বে}}"</string> diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml index 1f8fe2c70d24..d4389dc0a467 100644 --- a/core/res/res/values-az/strings.xml +++ b/core/res/res/values-az/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Zəng edənin kimliyi defolt olaraq qadağan deyil. Növbəti zəng: Qadağan deyil"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Zəng edənin kimliyi defolt olaraq qadağan deyil. Növbəti zəng: Qadağandır"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Zəng edənin kimliyi defolt olaraq qadağan deyil. Növbəti zəng: Qadağan deyil"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Bu tətbiq 16 KB ilə uyğunlaşmır. APK düzləndirmə yoxlaması alınmadı. Bu tətbiq səhifə ölçüsünə uyğun rejimdən istifadə edilməklə işlədiləcək. Ən yaxşı uyğunluq üçün tətbiqi 16 KB dəstəyi ilə yenidən tərtib edin. Ətraflı məlumat üçün nəzər salın: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Bu tətbiq 16 KB ilə uyğunlaşmır. ELF düzləndirmə yoxlaması alınmadı. Bu tətbiq səhifə ölçüsünə uyğun rejimdən istifadə edilməklə işlədiləcək. Ən yaxşı uyğunluq üçün tətbiqi 16 KB dəstəyi ilə yenidən tərtib edin. Ətraflı məlumat üçün nəzər salın: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Bu tətbiq 16 KB ilə uyğunlaşmır. APK və ELF düzləndirmə yoxlamaları uğursuz oldu. Bu tətbiq səhifə ölçüsünə uyğun rejimdən istifadə edilməklə işlədiləcək. Ən yaxşı uyğunluq üçün tətbiqi 16 KB dəstəyi ilə yenidən tərtib edin. Ətraflı məlumat üçün nəzər salın: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Xidmət təmin edilməyib."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Çağrı kimliyi ayarını dəyişə bilməzsiniz."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Data <xliff:g id="CARRIERDISPLAY">%s</xliff:g> operatoruna keçirilib"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> s ərzində"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> g ərzində"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> il ərzində"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# dəqiqə əvvəl}other{# dəqiqə əvvəl}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# saat əvvəl}other{# saat əvvəl}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# gün əvvəl}other{# gün əvvəl}}"</string> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 645239d5d9c3..911eede993cd 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ID pozivaoca je podrazumevano ograničen. Sledeći poziv: Nije ograničen."</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ID pozivaoca podrazumevano nije ograničen. Sledeći poziv: ograničen."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ID pozivaoca podrazumevano nije ograničen. Sledeći poziv: Nije ograničen."</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Ova aplikacija nije kompatibilna sa veličinom stranice od 16 kB. Provera usklađenosti APK-a nije uspela. Ova aplikacija će raditi pomoću režima kompatibilnog sa veličinom stranice. Da biste obezbedili najbolju kompatibilnost, ponovo kompajlirajte aplikaciju sa podrškom za veličinu stranice od 16 kB. Više informacija potražite na <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Ova aplikacija nije kompatibilna sa veličinom stranice od 16 kB. Provera usklađenosti ELF-a nije uspela. Ova aplikacija će raditi pomoću režima kompatibilnog sa veličinom stranice. Da biste obezbedili najbolju kompatibilnost, ponovo kompajlirajte aplikaciju sa podrškom za veličinu stranice od 16 kB. Više informacija potražite na <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Ova aplikacija nije kompatibilna sa veličinom stranice od 16 kB. Provere usklađenosti APK-a i ELF-a nisu uspele. Ova aplikacija će raditi pomoću režima kompatibilnog sa veličinom stranice. Da biste obezbedili najbolju kompatibilnost, ponovo kompajlirajte aplikaciju sa podrškom za veličinu stranice od 16 kB. Više informacija potražite na <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Usluga nije dobavljena."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Ne možete da promenite podešavanje ID-a korisnika."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Mobilni podaci su prebačeni na operatera <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"za <xliff:g id="COUNT">%d</xliff:g> s"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"za <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"za <xliff:g id="COUNT">%d</xliff:g> god"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Pre # minut}one{Pre # minut}few{Pre # minuta}other{Pre # minuta}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Pre # sat}one{Pre # sat}few{Pre # sata}other{Pre # sati}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Pre # dan}one{Pre # dan}few{Pre # dana}other{Pre # dana}}"</string> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 7fce2985f796..0165929df175 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -73,12 +73,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Ідэнтыфікатар АВН па змаўчанні абмежаваны. Наступны выклік: не абмежавана"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Па змаўчанні ідэнтыфікатар АВН не абмежаваны. Наступны выклік: абмежаваны"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Налады ідэнтыфікатару АВН па змаўчанні: не абмяжавана. Наступны выклік: не абмежавана"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Гэта праграма несумяшчальная з памерам 16 КБ. Не ўдалося праверыць выраўноўванне APK. Гэта праграма будзе працаваць у рэжыме, сумяшчальным з памерам старонкі. Для найлепшай сумяшчальнасці выканайце паўторнае кампіляванне праграмы з падтрымкай 16 КБ. Дадатковую інфармацыю можна знайсці на старонцы <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Гэта праграма несумяшчальная з памерам 16 КБ. Не ўдалося праверыць выраўноўванне ELF. Гэта праграма будзе працаваць у рэжыме, сумяшчальным з памерам старонкі. Для найлепшай сумяшчальнасці выканайце паўторнае кампіляванне праграмы з падтрымкай 16 КБ. Дадатковую інфармацыю можна знайсці на старонцы <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Гэта праграма несумяшчальная з памерам 16 КБ. Не ўдалося праверыць выраўноўванне APK і ELF. Гэта праграма будзе працаваць у рэжыме, сумяшчальным з памерам старонкі. Для найлепшай сумяшчальнасці выканайце паўторнае кампіляванне праграмы з падтрымкай 16 КБ. Дадатковую інфармацыю можна знайсці на старонцы <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Служба не прадастаўляецца."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Вы не можаце змяніць налады ідэнтыфікатара абанента, якi тэлефануе."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Мабільны трафік пераключаны на аператара \"<xliff:g id="CARRIERDISPLAY">%s</xliff:g>\""</string> @@ -1163,6 +1160,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"праз <xliff:g id="COUNT">%d</xliff:g> гадз"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"праз <xliff:g id="COUNT">%d</xliff:g> сут"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"праз <xliff:g id="COUNT">%d</xliff:g> г."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# хвіліну таму}one{# хвіліну таму}few{# хвіліны таму}many{# хвілін таму}other{# хвіліны таму}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# гадзіну таму}one{# гадзіну таму}few{# гадзіны таму}many{# гадзін таму}other{# гадзіны таму}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# дзень таму}one{# дзень таму}few{# дні таму}many{# дзён таму}other{# дня таму}}"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index aa03a69e9db3..1b6867557302 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Стандартната идентификация на повикванията е „забранено“. За следващото обаждане тя е разрешена."</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Стандартната идентификация на повикванията е „разрешено“. За следващото обаждане тя е забранена."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Стандартната идентификация на повикванията е „разрешено“. За следващото обаждане тя е разрешена."</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Това приложение не е съвместимо със страници с размер 16 KB. Проверката за съответствие с APK файла не бе успешна. Това приложение ще се изпълнява в режим на съвместимост с размера на страницата. За най-добра съвместимост компилирайте отново приложението така, че да поддържа страници с размер 16 KB. За повече информация вижте <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Това приложение не е съвместимо със страници с размер 16 KB. Проверката за съответствие с ELF файла не бе успешна. Това приложение ще се изпълнява в режим на съвместимост с размера на страницата. За най-добра съвместимост компилирайте отново приложението така, че да поддържа страници с размер 16 KB. За повече информация вижте <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Това приложение не е съвместимо със страници с размер 16 KB. Проверките за съответствие с APK и ELF файловете не бяха успешни. Това приложение ще се изпълнява в режим на съвместимост с размера на страницата. За най-добра съвместимост компилирайте отново приложението така, че да поддържа страници с размер 16 KB. За повече информация вижте <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Услугата не е обезпечена."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Не можете да променяте настройката за идентификация на обажданията."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Преминахте към мобилни данни от <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"след <xliff:g id="COUNT">%d</xliff:g> ч"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"след <xliff:g id="COUNT">%d</xliff:g> д"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"след <xliff:g id="COUNT">%d</xliff:g> г."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{преди # минута}other{преди # минути}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{преди # час}other{преди # часа}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{преди # ден}other{преди # дни}}"</string> diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml index 84d9c20b6d40..3b832e0b4299 100644 --- a/core/res/res/values-bn/strings.xml +++ b/core/res/res/values-bn/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ডিফল্টরূপে কলার আইডি সীমাবদ্ধ করা থাকে৷ পরবর্তী কল: সীমাবদ্ধ নয়"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ডিফল্টরূপে কলার আইডি সীমাবদ্ধ করা থাকে না৷ পরবর্তী কল: সীমাবদ্ধ"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ডিফল্টরূপে কলার আইডি সীমাবদ্ধ করা থাকে না৷ পরবর্তী কল: সীমাবদ্ধ নয়"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"এই অ্যাপ ১৬ কেবির সাথে মানানসই নয়। APK অ্যালাইনমেন্ট চেক করা যায়নি। এই অ্যাপ পৃষ্ঠার সাইজের সাথে মানানসই মোড ব্যবহার করে চলবে। সবচেয়ে ভালো মানানসই হিসেবে কাজ করার জন্য অ্যাপ্লিকেশনকে ১৬ কেবি সাপোর্টের সাথে আবার কম্পাইল করুন। আরও তথ্যের জন্য, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> দেখুন"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"এই অ্যাপ ১৬ কেবির সাথে মানানসই নয়। ELF অ্যালাইনমেন্ট চেক করা যায়নি। এই অ্যাপ পৃষ্ঠার সাইজের সাথে মানানসই মোড ব্যবহার করে চলবে। সবচেয়ে ভালো মানানসই হিসেবে কাজ করার জন্য অ্যাপ্লিকেশনকে ১৬ কেবি সাপোর্টের সাথে আবার কম্পাইল করুন। আরও তথ্যের জন্য, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> দেখুন"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"এই অ্যাপ ১৬ কেবির সাথে মানানসই নয়। APK ও ELF অ্যালাইনমেন্ট পরীক্ষা করা যায়নি। এই অ্যাপ পৃষ্ঠার সাইজের সাথে মানানসই মোড ব্যবহার করে চলবে। সবচেয়ে ভালো মানানসই হিসেবে কাজ করার জন্য অ্যাপ্লিকেশনকে ১৬ কেবি সাপোর্টের সাথে আবার কম্পাইল করুন। আরও তথ্যের জন্য, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> দেখুন"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"পরিষেবা প্রস্তুত নয়৷"</string> <string name="CLIRPermanent" msgid="166443681876381118">"আপনি কলার আইডি এর সেটিংস পরিবর্তন করতে পারবেন না৷"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"<xliff:g id="CARRIERDISPLAY">%s</xliff:g>-এর ডেটা ব্যবহার করা হয়েছে"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g>ঘণ্টার মধ্যে"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g>দিনের মধ্যে"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g>বছরের মধ্যে"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# মিনিট আগে}one{# মিনিট আগে}other{# মিনিট আগে}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ঘণ্টা আগে}one{# ঘণ্টা আগে}other{# ঘণ্টা আগে}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# দিন আগে}one{# দিন আগে}other{# দিন আগে}}"</string> diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml index 13d4ac306cff..64ded2d17e8f 100644 --- a/core/res/res/values-bs/strings.xml +++ b/core/res/res/values-bs/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Prikaz ID-a pozivaoca u zadanim postavkama zabranjen. Sljedeći poziv: nije zabranjen"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Prikaz ID-a pozivaoca u zadanim postavkama nije zabranjen. Sljedeći poziv: zabranjen"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Prikaz ID-a pozivaoca u zadanim postavkama nije zabranjen. Sljedeći poziv: nije zabranjen"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Ova aplikacija nije kompatibilna s veličinom stranice od 16 kB. Provjera poravnanja APK-a nije uspjela. Aplikacija će raditi pomoću načina rada za kompatibilnost s veličinom stranice. Za najbolju kompatibilnost ponovo kompajlirajte aplikaciju s podrškom za veličinu od 16 kB. Za više informacija pogledajte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Ova aplikacija nije kompatibilna s veličinom stranice od 16 kB. Provjera poravnanja ELF-a nije uspjela. Aplikacija će raditi pomoću načina rada za kompatibilnost s veličinom stranice. Za najbolju kompatibilnost ponovo kompajlirajte aplikaciju s podrškom za veličinu od 16 kB. Za više informacija pogledajte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Ova aplikacija nije kompatibilna s veličinom stranice od 16 kB. Provjere poravnanja APK-a i ELF-a nisu uspjele. Aplikacija će raditi pomoću načina rada za kompatibilnost s veličinom stranice. Za najbolju kompatibilnost ponovo kompajlirajte aplikaciju s podrškom za veličinu od 16 kB. Za više informacija pogledajte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Uslugu nije moguće koristiti."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Ne možete promijeniti postavke ID-a pozivaoca."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Prijenos podataka usmjeravanjem na <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"za <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"za <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"za <xliff:g id="COUNT">%d</xliff:g> g"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Prije # min}one{Prije # min}few{Prije # min}other{Prije # min}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Prije # h}one{Prije # h}few{Prije # h}other{Prije # h}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Prije # dan}one{Prije # dan}few{Prije # dana}other{Prije # dana}}"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index a5287c6b651c..d11941af34d5 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"El valor predeterminat de l\'identificador de trucada és restringit. Trucada següent: no restringit"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"El valor predeterminat de l\'identificador de trucada és no restringit. Trucada següent: restringit"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"El valor predeterminat de l\'identificador de trucada és no restringit. Trucada següent: no restringit"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Aquesta aplicació no és compatible amb 16 kB. No s\'ha pogut comprovar l\'alineació d\'APK. Aquesta aplicació s\'executarà en el mode compatible amb la mida de la pàgina. Per obtenir la millor compatibilitat, torna a compilar l\'aplicació amb compatibilitat de 16 kB. Per obtenir més informació, consulta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Aquesta aplicació no és compatible amb 16 kB. No s\'ha pogut comprovar l\'alineació d\'ELF. Aquesta aplicació s\'executarà en el mode compatible amb la mida de la pàgina. Per obtenir la millor compatibilitat, torna a compilar l\'aplicació amb compatibilitat de 16 kB. Per obtenir més informació, consulta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Aquesta aplicació no és compatible amb 16 kB. No s\'ha pogut comprovar l\'alineació d\'APK i ELF. Aquesta aplicació s\'executarà en el mode compatible amb la mida de la pàgina. Per obtenir la millor compatibilitat, torna a compilar l\'aplicació amb compatibilitat de 16 kB. Per obtenir més informació, consulta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"No s\'ha proveït el servei."</string> <string name="CLIRPermanent" msgid="166443681876381118">"No pots canviar la configuració de l\'identificador de trucada."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Les dades s\'han canviat a <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"d\'aquí a <xliff:g id="COUNT">%d</xliff:g> a"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Fa # minut}many{Fa # minuts}other{Fa # minuts}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Fa # hora}many{Fa # hores}other{Fa # hores}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Fa # dia}many{Fa # dies}other{Fa # dies}}"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index ad4df0fde106..50c3e6a62787 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -73,12 +73,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Ve výchozím nastavení je funkce ID volajícího omezena. Příští hovor: Neomezeno"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Ve výchozím nastavení není funkce ID volajícího omezena. Příští hovor: Omezeno"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Ve výchozím nastavení není funkce ID volajícího omezena. Příští hovor: Neomezeno"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Tato aplikace není kompatibilní s 16KB režimem. Kontrola zarovnání souboru APK selhala. Tato aplikace poběží v režimu kompatibilním s velikostmi stránek. Pro optimální kompatibilitu ji překompilujte s podporou 16KB režimu. Další informace najdete na stránce <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Tato aplikace není kompatibilní s 16KB režimem. Kontrola zarovnání souboru ELF selhala. Tato aplikace poběží v režimu kompatibilním s velikostmi stránek. Pro optimální kompatibilitu ji překompilujte s podporou 16KB režimu. Další informace najdete na stránce <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Tato aplikace není kompatibilní s 16KB režimem. Kontroly zarovnání souborů APK a ELF selhaly. Tato aplikace poběží v režimu kompatibilním s velikostmi stránek. Pro optimální kompatibilitu ji překompilujte s podporou 16KB režimu. Další informace najdete na stránce <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Služba není zřízena."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Nastavení ID volajícího nesmíte měnit."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Datové připojení bylo přepnuto na operátora <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1163,6 +1160,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"za <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"za <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"za <xliff:g id="COUNT">%d</xliff:g> r"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{před # minutou}few{před # minutami}many{před # minuty}other{před # minutami}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{před # hodinou}few{před # hodinami}many{před # hodiny}other{před # hodinami}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Před # dnem}few{před # dny}many{před # dne}other{před # dny}}"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index e77acd09c8fe..9bd5f70d6e6f 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Standarder for opkalds-id til begrænset. Næste opkald: Ikke begrænset"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Standarder for opkalds-id til ikke begrænset. Næste opkald: Begrænset"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Standarder for opkalds-id til ikke begrænset. Næste opkald: Ikke begrænset"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Denne app er ikke kompatibel med sidestørrelser på 16 kB. Tjek af APK-afstemning mislykkedes. Denne app køres i kompatibilitetstilstand for sidestørrelse. Kompiler appen igen, så den understøtter 16 kB, for at opnå bedst mulig kompatibilitet. Få flere oplysninger på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Denne app er ikke kompatibel med sidestørrelser på 16 kB. Tjek af ELF-afstemning mislykkedes. Denne app køres i kompatibilitetstilstand for sidestørrelse. Kompiler appen igen, så den understøtter 16 kB, for at opnå bedst mulig kompatibilitet. Få flere oplysninger på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Denne app er ikke kompatibel med sidestørrelser på 16 kB. Tjek af APK- og ELF-afstemning mislykkedes. Denne app køres i kompatibilitetstilstand for sidestørrelse. Kompiler appen igen, så den understøtter 16 kB, for at opnå bedst mulig kompatibilitet. Få flere oplysninger på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Tjenesten provisioneres ikke."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Du kan ikke ændre indstillingen for opkalds-id\'et."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Der blev skiftet til <xliff:g id="CARRIERDISPLAY">%s</xliff:g>-data"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"om <xliff:g id="COUNT">%d</xliff:g> t."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"om <xliff:g id="COUNT">%d</xliff:g> d."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"om <xliff:g id="COUNT">%d</xliff:g> år"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{For # minut siden}one{For # minut siden}other{For # minutter siden}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# time siden}one{# time siden}other{# timer siden}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{1 dag siden}one{1 dag siden}other{# dag siden}}"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index ac0a73bcaa69..06cadd54c07c 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Anrufer-ID ist standardmäßig beschränkt. Nächster Anruf: Nicht beschränkt"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Anrufer-ID ist standardmäßig nicht beschränkt. Nächster Anruf: Beschränkt"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Anrufer-ID ist standardmäßig nicht beschränkt. Nächster Anruf: Nicht beschränkt"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Diese App ist nicht mit 16 KB kompatibel. Die APK-Abgleichsprüfung ist fehlgeschlagen. Diese App wird im mit der Seitengröße kompatiblen Modus ausgeführt. Für eine optimale Kompatibilität rekompiliere die App, sodass sie 16 KB unterstützt. Weitere Informationen findest du unter <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Diese App ist nicht mit 16 KB kompatibel. Die ELF-Abgleichsprüfung ist fehlgeschlagen. Diese App wird im mit der Seitengröße kompatiblen Modus ausgeführt. Für eine optimale Kompatibilität rekompiliere die App, sodass sie 16 KB unterstützt. Weitere Informationen findest du unter <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Diese App ist nicht mit 16 KB kompatibel. APK- und ELF-Abgleichsprüfungen sind fehlgeschlagen. Diese App wird im mit der Seitengröße kompatiblen Modus ausgeführt. Für eine optimale Kompatibilität rekompiliere die App, sodass sie 16 KB unterstützt. Weitere Informationen findest du unter <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Dienst nicht eingerichtet."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Du kannst die Einstellung für die Anrufer-ID nicht ändern."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Mobile Daten wurden auf <xliff:g id="CARRIERDISPLAY">%s</xliff:g> umgestellt"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"in <xliff:g id="COUNT">%d</xliff:g> Std."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"in <xliff:g id="COUNT">%d</xliff:g> T"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"in <xliff:g id="COUNT">%d</xliff:g> J"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Vor # Minute}other{Vor # Minuten}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Vor # Stunde}other{Vor # Stunden}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Vor # Tag}other{Vor # Tagen}}"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index e0c2678289dc..b4b70d8545ef 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Η αναγνώριση κλήσης βρίσκεται από προεπιλογή στην \"περιορισμένη\". Επόμενη κλήση: Μη περιορισμένη"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Η αναγνώριση κλήσης βρίσκεται από προεπιλογή στην \"μη περιορισμένη\". Επόμενη κλήση: Περιορισμένη."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Η αναγνώριση κλήσης βρίσκεται από προεπιλογή στην \"μη περιορισμένη\". Επόμενη κλήση: Μη περιορισμένη"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Αυτή η εφαρμογή δεν είναι συμβατή για 16 KB. Ο έλεγχος ευθυγράμμισης APK απέτυχε. Αυτή η εφαρμογή θα εκτελεστεί χρησιμοποιώντας τη λειτουργία συμβατότητας μεγέθους σελίδας. Για τη βέλτιστη συμβατότητα, επαναμεταγλωττίστε την εφαρμογή με υποστήριξη 16 KB. Για περισσότερες πληροφορίες, ανατρέξτε στη διεύθυνση <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Αυτή η εφαρμογή δεν είναι συμβατή για 16 KB. Ο έλεγχος ευθυγράμμισης ELF απέτυχε. Αυτή η εφαρμογή θα εκτελεστεί χρησιμοποιώντας τη λειτουργία συμβατότητας μεγέθους σελίδας. Για τη βέλτιστη συμβατότητα, επαναμεταγλωττίστε την εφαρμογή με υποστήριξη 16 KB. Για περισσότερες πληροφορίες, ανατρέξτε στη διεύθυνση <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Αυτή η εφαρμογή δεν είναι συμβατή για 16 KB. Οι έλεγχοι ευθυγράμμισης APK και ELF απέτυχαν. Αυτή η εφαρμογή θα εκτελεστεί χρησιμοποιώντας τη λειτουργία συμβατότητας μεγέθους σελίδας. Για τη βέλτιστη συμβατότητα, επαναμεταγλωττίστε την εφαρμογή με υποστήριξη 16 KB. Για περισσότερες πληροφορίες, ανατρέξτε στη διεύθυνση <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Η υπηρεσία δεν προβλέπεται."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Δεν μπορείτε να αλλάξετε τη ρύθμιση του αναγνωριστικού καλούντος."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Έγινε εναλλαγή των δεδομένων σε <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"σε <xliff:g id="COUNT">%d</xliff:g>ώ."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"σε <xliff:g id="COUNT">%d</xliff:g>η."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"σε <xliff:g id="COUNT">%d</xliff:g>έτ."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# λεπτό πριν}other{Πριν από # λεπτά}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Πριν από # ώρα}other{Πριν από # ώρες}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Πριν από # ημέρα}other{Πριν από # ημέρες}}"</string> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index d17058a0de67..58037eb83069 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Caller ID defaults to restricted. Next call: Not restricted"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Caller ID defaults to not restricted. Next call: Restricted"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Caller ID defaults to not restricted. Next call: Not restricted"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"This app isn\'t 16 KB compatible. APK alignment check failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"This app isn\'t 16 KB compatible. ELF alignment check failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"This app isn\'t 16 KB compatible. APK and ELF alignment checks failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Service not provisioned."</string> <string name="CLIRPermanent" msgid="166443681876381118">"You can\'t change the caller ID setting."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Switched data to <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"in <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"in <xliff:g id="COUNT">%d</xliff:g>d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"in <xliff:g id="COUNT">%d</xliff:g> y"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minute ago}other{# minutes ago}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# hour ago}other{# hours ago}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# day ago}other{# days ago}}"</string> diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml index 3224c4785f4f..baa54bbf9a8e 100644 --- a/core/res/res/values-en-rCA/strings.xml +++ b/core/res/res/values-en-rCA/strings.xml @@ -1158,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"in <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"in <xliff:g id="COUNT">%d</xliff:g>d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"in <xliff:g id="COUNT">%d</xliff:g>y"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minute ago}other{# minutes ago}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# hour ago}other{# hours ago}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# day ago}other{# days ago}}"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index ed4e5966a400..43b6ba65ff35 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Caller ID defaults to restricted. Next call: Not restricted"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Caller ID defaults to not restricted. Next call: Restricted"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Caller ID defaults to not restricted. Next call: Not restricted"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"This app isn\'t 16 KB compatible. APK alignment check failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"This app isn\'t 16 KB compatible. ELF alignment check failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"This app isn\'t 16 KB compatible. APK and ELF alignment checks failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Service not provisioned."</string> <string name="CLIRPermanent" msgid="166443681876381118">"You can\'t change the caller ID setting."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Switched data to <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"in <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"in <xliff:g id="COUNT">%d</xliff:g>d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"in <xliff:g id="COUNT">%d</xliff:g> y"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minute ago}other{# minutes ago}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# hour ago}other{# hours ago}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# day ago}other{# days ago}}"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index b17c07b460e2..1a0f8e42d341 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Caller ID defaults to restricted. Next call: Not restricted"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Caller ID defaults to not restricted. Next call: Restricted"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Caller ID defaults to not restricted. Next call: Not restricted"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"This app isn\'t 16 KB compatible. APK alignment check failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"This app isn\'t 16 KB compatible. ELF alignment check failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"This app isn\'t 16 KB compatible. APK and ELF alignment checks failed. This app will be run using page size compatible mode. For best compatibility, please recompile the application with 16 KB support. For more information, see <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Service not provisioned."</string> <string name="CLIRPermanent" msgid="166443681876381118">"You can\'t change the caller ID setting."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Switched data to <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"in <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"in <xliff:g id="COUNT">%d</xliff:g>d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"in <xliff:g id="COUNT">%d</xliff:g> y"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minute ago}other{# minutes ago}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# hour ago}other{# hours ago}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# day ago}other{# days ago}}"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index e9f795ea25f0..3c739206ec7c 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"El Identificador de llamadas está predeterminado en restringido. Llamada siguiente: no restringido"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"El identificador de llamadas está predeterminado en no restringido. Llamada siguiente: restringida"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"El Identificador de llamadas está predeterminado en no restringido. Llamada siguiente: no restringido"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Esta app no es compatible con 16 KB. No se pudo verificar la alineación del APK. Esta app se ejecutará con el modo de compatibilidad de tamaño de página. Para obtener mejores resultados, vuelve a compilar la aplicación con la compatibilidad de 16 KB. Para obtener más información, consulta el siguiente vínculo: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Esta app no es compatible con 16 KB. No se pudo verificar la alineación de ELF. Esta app se ejecutará con el modo de compatibilidad de tamaño de página. Para obtener mejores resultados, vuelve a compilar la aplicación con la compatibilidad de 16 KB. Para obtener más información, consulta el siguiente vínculo: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Esta app no es compatible con 16 KB. No se pudieron verificar las alineaciones de APK y ELF. Esta app se ejecutará con el modo de compatibilidad de tamaño de página. Para obtener mejores resultados, vuelve a compilar la aplicación con la compatibilidad de 16 KB. Para obtener más información, consulta el siguiente vínculo: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Servicio no suministrado."</string> <string name="CLIRPermanent" msgid="166443681876381118">"No puedes cambiar la configuración del identificador de llamadas."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Se cambiaron los datos a <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"en <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"en <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"en <xliff:g id="COUNT">%d</xliff:g> años"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Hace # minuto}many{Hace # minutos}other{Hace # minutos}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Hace # hora}many{Hace # de horas}other{Hace # horas}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Hace # día}many{Hace # de días}other{Hace # días}}"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index b7893df81fa1..a81af9f3acd2 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"La identificación del emisor presenta el valor predeterminado de restringido. Siguiente llamada: No restringido"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"La la identificación del emisor presenta el valor predeterminado de no restringido. Siguiente llamada: Restringido"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"La identificación del emisor presenta el valor predeterminado de no restringido. Siguiente llamada: No restringido"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Esta aplicación no es compatible con el modo de 16 KB. No se ha podido comprobar la alineación del APK. Esta aplicación se ejecutará en el modo compatible con el tamaño de página. Para obtener la mejor compatibilidad, vuelve a compilar la aplicación con compatibilidad de 16 KB. Para obtener más información, consulta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Esta aplicación no es compatible con el modo de 16 KB. No se ha podido comprobar la alineación de ELF. Esta aplicación se ejecutará en el modo compatible con el tamaño de página. Para obtener la mejor compatibilidad, vuelve a compilar la aplicación con compatibilidad de 16 KB. Para obtener más información, consulta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Esta aplicación no es compatible con el modo de 16 KB. No se han podido comprobar las alineaciones de APK y ELF. Esta aplicación se ejecutará en el modo compatible con el tamaño de página. Para obtener la mejor compatibilidad, vuelve a compilar la aplicación con compatibilidad de 16 KB. Para obtener más información, consulta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"El servicio no se suministra."</string> <string name="CLIRPermanent" msgid="166443681876381118">"No puedes modificar la identificación de emisor."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Datos cambiados a <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"en <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"en <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"en <xliff:g id="COUNT">%d</xliff:g>a"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Hace # minuto}many{Hace # minutos}other{Hace # minutos}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Hace # hora}many{Hace # horas}other{Hace # horas}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Hace # día}many{Hace # días}other{Hace # días}}"</string> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 090d0cce6afb..c5cadcf594b5 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Helistaja ID vaikimisi piiratud. Järgmine kõne: pole piiratud"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Vaikimisi pole helistaja ID piiratud. Järgmine kõne: piiratud"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Helistaja ID pole vaikimisi piiratud. Järgmine kõne: pole piiratud"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"See rakendus ei ole suurusega 16 kB ühilduv. APK joonduse kontroll ebaõnnestus. Seda rakendust käitatakse lehesuurusega ühilduvas režiimis. Parima ühilduvuse tagamiseks kompileerige rakendus 16 kB toega uuesti. Lisateave: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"See rakendus ei ole suurusega 16 kB ühilduv. ELF-i joonduse kontroll ebaõnnestus. Seda rakendust käitatakse lehesuurusega ühilduvas režiimis. Parima ühilduvuse tagamiseks kompileerige rakendus 16 kB toega uuesti. Lisateave: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"See rakendus ei ole suurusega 16 kB ühilduv. APK ja ELF-i joonduse kontroll ebaõnnestus. Seda rakendust käitatakse lehesuurusega ühilduvas režiimis. Parima ühilduvuse tagamiseks kompileerige rakendus 16 kB toega uuesti. Lisateave: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Teenus pole ette valmistatud."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Helistaja ID seadet ei saa muuta."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Mobiilne andmeside lülitati operaatorile <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> h pärast"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> p pärast"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> a pärast"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minut tagasi}other{# minutit tagasi}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# tund tagasi}other{# tundi tagasi}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# päev tagasi}other{# päeva tagasi}}"</string> diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index d27a582224a0..a0b2cc311214 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Deitzailearen identitatea adierazteko zerbitzuaren balio lehenetsiak murriztapenak ezartzen ditu. Hurrengo deia: murriztapenik gabe."</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Deitzailearen identitatea zerbitzuaren balio lehenetsiak ez du murriztapenik ezartzen. Hurrengo deia: murriztapenekin."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Deitzailearen identitatea zerbitzuaren balio lehenetsiak ez du murriztapenik ezartzen. Hurrengo deia: murriztapenik gabe."</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Aplikazio hau ez da bateragarria 16 KBko bertsioarekin. Ezin izan da egiaztatu APKren lerrokatzea. Orriaren tamainarekin bateragarria den modua erabilita exekutatuko da aplikazioa. Emaitza onenak lortzeko, konpilatu aplikazioa berriro 16 KBko bertsioarekin bateragarria izan dadin. Informazio gehiago lortzeko, joan hona: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Aplikazio hau ez da bateragarria 16 KBko bertsioarekin. Ezin izan da egiaztatu ELFaren lerrokatzea. Orriaren tamainarekin bateragarria den modua erabilita exekutatuko da aplikazioa. Emaitza onenak lortzeko, konpilatu aplikazioa berriro 16 KBko bertsioarekin bateragarria izan dadin. Informazio gehiago lortzeko, joan hona: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Aplikazio hau ez da bateragarria 16 KBko bertsioarekin. Ezin izan da egiaztatu APK eta ELF arteko lerrokatzea. Orriaren tamainarekin bateragarria den modua erabilita exekutatuko da aplikazioa. Emaitza onenak lortzeko, konpilatu aplikazioa berriro 16 KBko bertsioarekin bateragarria izan dadin. Informazio gehiago lortzeko, joan hona: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Zerbitzua ez da hornitu."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Ezin duzu aldatu deitzailearen identitatearen ezarpena."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"<xliff:g id="CARRIERDISPLAY">%s</xliff:g> operadorearen datu-konexiora aldatu zara"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> h barru"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> eg. barru"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> ur. barru"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Duela # minutu}other{Duela # minutu}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Duela # ordu}other{Duela # ordu}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Duela # egun}other{Duela # egun}}"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 50c0e371aa81..4d3f1a3651d5 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"پیشفرض شناسه تماسگیرنده روی محدود است. تماس بعدی: بدون محدودیت"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"پیشفرض شناسه تماسگیرنده روی غیرمحدود است. تماس بعدی: محدود"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"پیشفرض شناسه تماسگیرنده روی غیرمحدود است. تماس بعدی: بدون محدودیت"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"این برنامه با صفحه ۱۶ کیلوبایتی سازگار نیست. بررسی تراز APK ناموفق بود. این برنامه بااستفاده از حالت سازگار اندازه صفحه اجرا خواهد شد. برای بهترین سازگاری، لطفاً برنامه را با پشتیبانی از صفحه ۱۶ کیلوبایتی دوباره ترجمه کنید. برای اطلاعات بیشتر، به <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> مراجعه کنید"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"این برنامه با صفحه ۱۶ کیلوبایتی سازگار نیست. بررسی تراز ELF ناموفق بود. این برنامه بااستفاده از حالت سازگار اندازه صفحه اجرا خواهد شد. برای بهترین سازگاری، لطفاً برنامه را با پشتیبانی از صفحه ۱۶ کیلوبایتی دوباره ترجمه کنید. برای اطلاعات بیشتر، به <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> مراجعه کنید"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"این برنامه با صفحه ۱۶ کیلوبایتی سازگار نیست. بررسیهای تراز APK و ELF ناموفق بود. این برنامه بااستفاده از حالت سازگار اندازه صفحه اجرا خواهد شد. برای بهترین سازگاری، لطفاً برنامه را با پشتیبانی از صفحه ۱۶ کیلوبایتی دوباره ترجمه کنید. برای اطلاعات بیشتر، به <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> مراجعه کنید"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"سرویس دارای مجوز نیست."</string> <string name="CLIRPermanent" msgid="166443681876381118">"شما میتوانید تنظیم شناسه تماسگیرنده را تغییر دهید."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"داده به <xliff:g id="CARRIERDISPLAY">%s</xliff:g> تغییر کرد"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"تا <xliff:g id="COUNT">%d</xliff:g> ساعت دیگر"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"تا <xliff:g id="COUNT">%d</xliff:g> روز دیگر"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"تا <xliff:g id="COUNT">%d</xliff:g> سال دیگر"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# دقیقه قبل}one{# دقیقه قبل}other{# دقیقه قبل}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ساعت قبل}one{# ساعت قبل}other{# ساعت قبل}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# روز قبل}one{# روز قبل}other{# روز قبل}}"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 7d4754126f17..2f57750c47ec 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Soittajan tunnukseksi muutetaan rajoitettu. Seuraava puhelu: ei rajoitettu"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Soittajan tunnukseksi muutetaan rajoittamaton. Seuraava puhelu: rajoitettu"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Soittajan tunnukseksi muutetaan rajoittamaton. Seuraava puhelu: ei rajoitettu"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Tämä sovellus ei tue 16 kt:tä. APK-sovelluksen yhteensopivuustarkistus epäonnistui. Sovellus käynnistetään sivukoon kanssa yhteensopivan tilan avulla. Parhaan yhteensopivuuden varmistamiseksi kokoa sovellus uudelleen niin, että se tukee 16 kt:tä. Katso lisätietoa osoitteesta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Tämä sovellus ei tue 16 kt:tä. ELF:n yhteensopivuustarkastus epäonnistui. Sovellus käynnistetään sivukoon kanssa yhteensopivan tilan avulla. Parhaan yhteensopivuuden varmistamiseksi kokoa sovellus uudelleen niin, että se tukee 16 kt:tä. Katso lisätietoa osoitteesta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Tämä sovellus ei tue 16 kt:tä. APK:n ja ELF:n yhteensopivuustarkastukset epäonnistuivat. Sovellus käynnistetään sivukoon kanssa yhteensopivan tilan avulla. Parhaan yhteensopivuuden varmistamiseksi kokoa sovellus uudelleen niin, että se tukee 16 kt:tä. Katso lisätietoa osoitteesta <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Palvelua ei tarjota."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Et voi muuttaa soittajan tunnuksen asetusta."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Data vaihdettu: <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> h:n päästä"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> pv:n päästä"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> v:n päästä"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minuutti sitten}other{# minuuttia sitten}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# tunti sitten}other{# tuntia sitten}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# päivä sitten}other{# päivää sitten}}"</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 685d940f3509..a87fd677d37e 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Par défaut, les numéros des appelants ne sont pas restreints. Appel suivant : non restreint"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Par défaut, les numéros des appelants ne sont pas restreints. Appel suivant : restreint"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Par défaut, les numéros des appelants ne sont pas restreints. Appel suivant : non restreint"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Cette appli n\'est pas compatible avec les pages de 16 ko. La vérification de l\'alignement de fichiers APK a échoué. Cette appli sera exécutée en mode compatible avec la taille de la page. Pour une meilleure compatibilité, veuillez recompiler l\'application avec la prise en charge de pages de 16 ko. Pour en savoir plus, consultez la page <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Cette appli n\'est pas compatible avec les pages de 16 ko. La vérification de l\'alignement de fichiers ELF a échoué. Cette appli sera exécutée en mode compatible avec la taille de la page. Pour une meilleure compatibilité, veuillez recompiler l\'application avec la prise en charge de pages de 16 ko. Pour en savoir plus, consultez la page <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Cette appli n\'est pas compatible avec les pages de 16 ko. Les vérifications d\'alignement de fichiers APK et ELF ont échoué. Cette appli sera exécutée en mode compatible avec la taille de la page. Pour une meilleure compatibilité, veuillez recompiler l\'application avec la prise en charge de pages de 16 ko. Pour en savoir plus, consultez la page <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Ce service n\'est pas pris en charge."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Impossible de modifier le paramètre relatif au numéro de l\'appelant."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Données changées à <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"dans <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"dans <xliff:g id="COUNT">%d</xliff:g> j"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"dans <xliff:g id="COUNT">%d</xliff:g> a"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Il y a # minute}one{Il y a # minute}many{Il y a # minutes}other{Il y a # minutes}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Il y a # heure}one{Il y a # heure}many{Il y a # heures}other{Il y a # heures}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Il y a # jour}one{Il y a # jour}many{Il y a # jours}other{Il y a # jours}}"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index e576e9287a1f..ba09a532be06 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Par défaut, les numéros des appelants ne sont pas restreints. Appel suivant : non restreint"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Par défaut, les numéros des appelants ne sont pas restreints. Appel suivant : restreint"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Par défaut, les numéros des appelants ne sont pas restreints. Appel suivant : non restreint"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Cette appli n\'est pas compatible avec les pages de 16 ko. Échec de la vérification de l\'alignement de l\'APK. Cette appli sera exécutée dans un mode compatible avec la taille de la page. Pour une compatibilité optimale, veuillez recompiler l\'application de manière à ce que la taille de 16 ko soit prise en charge. Pour en savoir plus, consultez <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Cette appli n\'est pas compatible avec les pages de 16 ko. Échec de la vérification de l\'alignement de l\'ELF. Cette appli sera exécutée dans un mode compatible avec la taille de la page. Pour une compatibilité optimale, veuillez recompiler l\'application de manière à ce que la taille de 16 ko soit prise en charge. Pour en savoir plus, consultez <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Cette appli n\'est pas compatible avec les pages de 16 ko. Échec des vérifications de l\'alignement de l\'APK et de l\'ELF. Cette appli sera exécutée dans un mode compatible avec la taille de la page. Pour une compatibilité optimale, veuillez recompiler l\'application de manière à ce que la taille de 16 ko soit prise en charge. Pour en savoir plus, consultez <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Ce service n\'est pas pris en charge."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Impossible de modifier le paramètre relatif au numéro de l\'appelant."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Données transférées vers <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"dans <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"dans <xliff:g id="COUNT">%d</xliff:g> j"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"dans <xliff:g id="COUNT">%d</xliff:g> an"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Il y a # minute}one{Il y a # minute}many{Il y a # minutes}other{Il y a # minutes}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Il y a # heure}one{Il y a # heure}many{Il y a # heures}other{Il y a # heures}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Il y a # jour}one{Il y a # jour}many{Il y a # jours}other{Il y a # jours}}"</string> diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml index f2354f50a09e..c46436f7e311 100644 --- a/core/res/res/values-gl/strings.xml +++ b/core/res/res/values-gl/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"O valor predeterminado do identificador de chamada é restrinxido. Próxima chamada: non restrinxido"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"O valor predeterminado do identificador de chamada é non restrinxido. Próxima chamada: restrinxido"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"O valor predeterminado do identificador de chamada é restrinxido. Próxima chamada: non restrinxido"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Esta aplicación non é compatible con 16 kB. Produciuse un erro ao verificar o aliñamento de ficheiros APK. Esta aplicación executarase usando o modo compatible co tamaño de páxina. Para obter a mellor compatibilidade, volve compilar a aplicación con asistencia de 16 kB. Se precisas máis información, atoparala en <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Esta aplicación non é compatible con 16 kB. Produciuse un erro ao verificar o aliñamento de ficheiros ELF. Esta aplicación executarase usando o modo compatible co tamaño de páxina. Para obter a mellor compatibilidade, volve compilar a aplicación con asistencia de 16 kB. Se precisas máis información, atoparala en <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Esta aplicación non é compatible con 16 kB. Produciuse un erro ao verificar o aliñamento de ficheiros APK e ELF. Esta aplicación executarase usando o modo compatible co tamaño de páxina. Para obter a mellor compatibilidade, volve compilar a aplicación con asistencia de 16 kB. Se precisas máis información, atoparala en <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Servizo non ofrecido."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Non podes cambiar a configuración do identificador de chamada."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Cambiouse a conexión de datos a <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"en <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"en <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"en <xliff:g id="COUNT">%d</xliff:g> a"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Hai # minuto}other{Hai # minutos}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Hai # hora}other{Hai # horas}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Hai # día}other{Hai # días}}"</string> diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml index 6291688d133b..89f5a59ca916 100644 --- a/core/res/res/values-gu/strings.xml +++ b/core/res/res/values-gu/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"કૉલર ID પ્રતિબંધિત પર ડિફોલ્ટ છે. આગલો કૉલ: પ્રતિબંધિત નહીં"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"કૉલર ID પ્રતિબંધિત નહીં પર ડિફોલ્ટ છે. આગલો કૉલ: પ્રતિબંધિત"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"કૉલર ID પ્રતિબંધિત નહીં પર ડિફોલ્ટ છે. આગલો કૉલ: પ્રતિબંધિત નહીં"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"આ ઍપ 16 KB સુસંગત નથી. APK સંરેખણની તપાસ નિષ્ફળ રહી. આ ઍપ પેજના કદ સાથે સુસંગત મોડનો ઉપયોગ કરીને ચાલશે. શ્રેષ્ઠ સુસંગતતા માટે, કૃપા કરીને 16 KB સપોર્ટવાળી ઍપ્લિકેશન ફરીથી સંકલિત કરો. વધુ માહિતી માટે, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> જુઓ"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"આ ઍપ 16 KB સુસંગત નથી. ELF સંરેખણની તપાસ નિષ્ફળ રહી. આ ઍપ પેજના કદ સાથે સુસંગત મોડનો ઉપયોગ કરીને ચાલશે. શ્રેષ્ઠ સુસંગતતા માટે, કૃપા કરીને 16 KB સપોર્ટવાળી ઍપ્લિકેશન ફરીથી સંકલિત કરો. વધુ માહિતી માટે, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> જુઓ"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"આ ઍપ 16 KB સુસંગત નથી. APK અને ELF સંરેખણની તપાસ નિષ્ફળ રહી. આ ઍપ પેજના કદ સાથે સુસંગત મોડનો ઉપયોગ કરીને ચાલશે. શ્રેષ્ઠ સુસંગતતા માટે, કૃપા કરીને 16 KB સપોર્ટવાળી ઍપ્લિકેશન ફરીથી સંકલિત કરો. વધુ માહિતી માટે, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> જુઓ"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"સેવાની જોગવાઈ કરી નથી."</string> <string name="CLIRPermanent" msgid="166443681876381118">"તમે કૉલર ID સેટિંગ બદલી શકતાં નથી."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"ડેટા <xliff:g id="CARRIERDISPLAY">%s</xliff:g> પર સ્વિચ કર્યો"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> કલાકમાં"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> દિવસમાં"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> વર્ષમાં"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# મિનિટ પહેલાં}one{# મિનિટ પહેલાં}other{# મિનિટ પહેલાં}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# કલાક પહેલાં}one{# કલાક પહેલાં}other{# કલાક પહેલાં}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# દિવસ પહેલાં}one{# દિવસ પહેલાં}other{# દિવસ પહેલાં}}"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 75c8bd616bf1..4bdfa6baf14d 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"कॉलर आईडी डिफ़ॉल्ट रूप से सीमित है. अगली कॉल: सीमित नहीं"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"कॉलर आईडी डिफ़ॉल्ट रूप से सीमित नहीं है. अगली कॉल: सीमित"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"कॉलर आईडी डिफ़ॉल्ट रूप से सीमित नहीं है. अगली कॉल: सीमित नहीं"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"यह ऐप्लिकेशन 16 केबी वाले पेजों के साथ काम नहीं करता. APK के अलाइनमेंट की जांच नहीं की जा सकी. यह ऐप्लिकेशन, पेज साइज़ के साथ काम करने वाले मोड का इस्तेमाल करके चलेगा. पेज साइज़ के साथ बेहतर तरीके से काम के लिए, कृपया 16 केबी वाले पेजों के साथ ऐप्लिकेशन को फिर से कंपाइल करें. ज़्यादा जानकारी के लिए, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> पर जाएं"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"यह ऐप्लिकेशन 16 केबी वाले पेजों के साथ काम नहीं करता. ईएलएफ़ अलाइनमेंट की जांच नहीं की जा सकी. यह ऐप्लिकेशन, पेज साइज़ के साथ काम करने वाले मोड का इस्तेमाल करके चलेगा. पेज साइज़ के साथ बेहतर तरीके से काम के लिए, कृपया 16 केबी वाले पेजों के साथ ऐप्लिकेशन को फिर से कंपाइल करें. ज़्यादा जानकारी के लिए, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> पर जाएं"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"यह ऐप्लिकेशन 16 केबी वाले पेजों के साथ काम नहीं करता. APK और ईएलएफ़ के अलाइनमेंट की जांच नहीं की जा सकी. यह ऐप्लिकेशन, पेज साइज़ के साथ काम करने वाले मोड का इस्तेमाल करके चलेगा. पेज साइज़ के साथ बेहतर तरीके से काम के लिए, कृपया 16 केबी वाले पेजों के साथ ऐप्लिकेशन को फिर से कंपाइल करें. ज़्यादा जानकारी के लिए, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> पर जाएं"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"सेवा प्रावधान की हुई नहीं है."</string> <string name="CLIRPermanent" msgid="166443681876381118">"आप कॉलर आईडी सेटिंग नहीं बदल सकते."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"डेटा को <xliff:g id="CARRIERDISPLAY">%s</xliff:g> पर स्विच किया गया"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> घंटे में"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> दिन में"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> साल में"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# मिनट पहले}one{# मिनट पहले}other{# मिनट पहले}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# घंटा पहले}one{# घंटा पहले}other{# घंटे पहले}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# दिन पहले}one{# दिन पहले}other{# दिन पहले}}"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 0516c4634ed2..cd7d02343217 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Zadana postavka ID-a pozivatelja ima ograničenje. Sljedeći poziv: Nije ograničen"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Zadana postavka ID-a pozivatelja nema ograničenje. Sljedeći poziv: Ograničen"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Zadana postavka ID-a pozivatelja nema ograničenje. Sljedeći poziv: Nije ograničen"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Ova aplikacija nije kompatibilna s veličinom stranice od 16 KB. Provjera poravnanja APK-a nije uspjela. Ova će se aplikacija pokrenuti pomoću načina kompatibilnog s veličinom stranice. Za najbolju kompatibilnost ponovo kompilirajte aplikaciju s podrškom od 16 KB. Više informacija potražite na stranici <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Ova aplikacija nije kompatibilna s veličinom stranice od 16 KB. Provjera poravnanja ELF-a nije uspjela. Ova će se aplikacija pokrenuti pomoću načina kompatibilnog s veličinom stranice. Za najbolju kompatibilnost ponovo kompilirajte aplikaciju s podrškom od 16 KB. Više informacija potražite na stranici <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Ova aplikacija nije kompatibilna s veličinom stranice od 16 KB. Provjere poravnanja APK-a i ELF-a nisu uspjele. Ova će se aplikacija pokrenuti pomoću načina kompatibilnog s veličinom stranice. Za najbolju kompatibilnost ponovo kompilirajte aplikaciju s podrškom od 16 KB. Više informacija potražite na stranici <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Usluga nije rezervirana."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Ne možete promijeniti postavku ID-a pozivatelja."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Podaci su prebačeni na <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"za <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"za <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"za <xliff:g id="COUNT">%d</xliff:g> g."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Prije # min}one{Prije # min}few{Prije # min}other{Prije # min}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Prije # h}one{Prije # h}few{Prije # h}other{Prije # h}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Prije # dan}one{Prije # dan}few{Prije # dana}other{Prije # dana}}"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index e980141bcd43..ddc8762931b9 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"A hívóazonosító alapértelmezett értéke korlátozott. Következő hívás: nem korlátozott"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"A hívóazonosító alapértelmezett értéke nem korlátozott. Következő hívás: korlátozott"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"A hívóazonosító alapértelmezett értéke nem korlátozott. Következő hívás: nem korlátozott"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Ez az alkalmazás nem kompatibilis a 16 kB-os mérettel. Az APK-igazítási ellenőrzés sikertelen volt. Ez az app az oldalméret-kompatibilis mód használatával fog futni. A legjobb kompatibilitás érdekében fordítsa újra az alkalmazást 16 kB-os támogatással. További információ: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Ez az alkalmazás nem kompatibilis a 16 kB-os mérettel. Az ELF-igazítási ellenőrzés sikertelen. Ez az app az oldalméret-kompatibilis mód használatával fog futni. A legjobb kompatibilitás érdekében fordítsa újra az alkalmazást 16 kB-os támogatással. További információ: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Ez az alkalmazás nem kompatibilis a 16 kB-os mérettel. Az APK- és ELF-igazítási ellenőrzések sikertelenek voltak. Ez az app az oldalméret-kompatibilis mód használatával fog futni. A legjobb kompatibilitás érdekében fordítsa újra az alkalmazást 16 kB-os támogatással. További információ: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"A szolgáltatás nincs biztosítva."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Nem tudja módosítani a hívó fél azonosítója beállítást."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Adatforgalom átváltva a következőre: <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> ó múlva"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> n múlva"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> é múlva"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# perce}other{# perce}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# órája}other{# órája}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# napja}other{# napja}}"</string> diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index f734a5e2bc67..3e961e74d17b 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Զանգողի ID-ն լռելյայն սահմանափակված է: Հաջորդ զանգը` չսահմանափակված"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Զանգողի ID-ն լռելյայն չսահմանափակված է: Հաջորդ զանգը` Սահմանափակված"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Զանգողի ID-ն լռելյայն չսահմանափակված է: Հաջորդ զանգը` չսահմանափակված"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Այս հավելվածը հարմարեցված չէ 16 ԿԲ չափի համար։ APK-ի հետ համատեղելիությունը ձախողվել է։ Այս հավելվածը կաշխատի էջի չափի հետ համատեղելի ռեժիմում։ Համատեղելիությունն ապահովելու համար նորից կոմպիլացրեք հավելվածը 16 ԿԲ չափն աջակցելու համար։ Լրացուցիչ տեղեկություններ ստանալու համար այցելեք <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Այս հավելվածը հարմարեցված չէ 16 ԿԲ չափի համար։ ELF-ի հետ համատեղելիությունը ձախողվել է։ Այս հավելվածը կաշխատի էջի չափի հետ համատեղելի ռեժիմում։ Համատեղելիությունն ապահովելու համար նորից կոմպիլացրեք հավելվածը 16 ԿԲ չափն աջակցելու համար։ Լրացուցիչ տեղեկություններ ստանալու համար այցելեք <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Այս հավելվածը հարմարեցված չէ 16 ԿԲ չափի համար։ APK-ի և ELF-ի հետ համատեղելիության ստուգումը ձախողվել է։ Այս հավելվածը կաշխատի էջի չափի հետ համատեղելի ռեժիմում։ Համատեղելիությունն ապահովելու համար նորից կոմպիլացրեք հավելվածը 16 ԿԲ չափն աջակցելու համար։ Լրացուցիչ տեղեկություններ ստանալու համար այցելեք <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Ծառայությունը չի տրամադրվում:"</string> <string name="CLIRPermanent" msgid="166443681876381118">"Դուք չեք կարող փոխել զանգողի ID-ի կարգավորումները:"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Օգտագործվում է <xliff:g id="CARRIERDISPLAY">%s</xliff:g>-ի բջջային ինտերնետը"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> ժամից"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> օրից"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> տարուց"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# րոպե առաջ}one{# րոպե առաջ}other{# րոպե առաջ}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ժամ առաջ}one{# ժամ առաջ}other{# ժամ առաջ}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# օր առաջ}one{# օր առաջ}other{# օր առաջ}}"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 33126621a96d..594c173b907c 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ID penelepon diatur default ke \"dibatasi\". Panggilan selanjutnya: Tidak dibatasi."</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ID penelepon diatur default ke tidak dibatasi. Panggilan selanjutnya: Dibatasi"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ID penelepon diatur default ke tidak dibatasi. Panggilan selanjutnya: Tidak dibatasi"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Aplikasi ini tidak kompatibel dengan 16 KB. Pemeriksaan keselarasan APK gagal. Aplikasi ini akan dijalankan menggunakan mode yang kompatibel dengan ukuran halaman. Untuk kompatibilitas terbaik, kompilasi ulang aplikasi dengan dukungan 16 KB. Untuk mengetahui informasi selengkapnya, lihat <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Aplikasi ini tidak kompatibel dengan 16 KB. Pemeriksaan keselarasan ELF gagal. Aplikasi ini akan dijalankan menggunakan mode yang kompatibel dengan ukuran halaman. Untuk kompatibilitas terbaik, kompilasi ulang aplikasi dengan dukungan 16 KB. Untuk mengetahui informasi selengkapnya, lihat <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Aplikasi ini tidak kompatibel dengan 16 KB. Pemeriksaan keselarasan APK dan ELF gagal. Aplikasi ini akan dijalankan menggunakan mode yang kompatibel dengan ukuran halaman. Untuk kompatibilitas terbaik, kompilasi ulang aplikasi dengan dukungan 16 KB. Untuk mengetahui informasi selengkapnya, lihat <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Layanan tidak diperlengkapi."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Anda tidak dapat mengubah setelan ID penelepon."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Mengalihkan data seluler ke <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"dalam <xliff:g id="COUNT">%d</xliff:g> j"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"dalam <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"dalam <xliff:g id="COUNT">%d</xliff:g> t"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# menit lalu}other{# menit lalu}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# jam lalu}other{# jam lalu}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# hari lalu}other{# hari lalu}}"</string> diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml index cbf9798cbbd5..0242fa3e43d6 100644 --- a/core/res/res/values-is/strings.xml +++ b/core/res/res/values-is/strings.xml @@ -1158,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"eftir <xliff:g id="COUNT">%d</xliff:g> klst."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"eftir <xliff:g id="COUNT">%d</xliff:g> d."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"eftir <xliff:g id="COUNT">%d</xliff:g> ár"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Fyrir # mínútu}one{Fyrir # mínútu}other{Fyrir # mínútum}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Fyrir # klukkustund}one{Fyrir # klukkustund}other{Fyrir # klukkustundum}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Fyrir # degi}one{Fyrir # degi}other{Fyrir # dögum}}"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 747212abac5e..e912417fe4d7 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1159,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"tra <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"tra <xliff:g id="COUNT">%d</xliff:g> g"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"tra <xliff:g id="COUNT">%d</xliff:g> a"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minuto fa}many{# di minuti fa}other{# minuti fa}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ora fa}many{# di ore fa}other{# ore fa}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# giorno fa}many{# di giorni fa}other{# giorni fa}}"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index afdd1578454b..a9ce2d284528 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"שירות השיחה המזוהה עובר כברירת מחדל למצב מוגבל. השיחה הבאה: לא מוגבלת"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"שירות \'שיחה מזוהה\' עובר כברירת מחדל למצב לא מוגבל. השיחה הבאה: מוגבלת"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"זיהוי מתקשר עובר כברירת מחדל למצב לא מוגבל. השיחה הבאה: לא מוגבלת"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"האפליקציה הזו לא תואמת לדפים בגודל 16KB. בדיקות ההתאמה ל-APK נכשלה. האפליקציה הזו תופעל במצב תואם לגודל הדף. כדי לקבל את התאימות הטובה ביותר, צריך להדר מחדש (recompile) את האפליקציה לתמיכה בדפים בגודל 16KB. מידע נוסף זמין בכתובת <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"האפליקציה הזו לא תואמת לדפים בגודל 16KB. בדיקות ההתאמה ל-ELF נכשלה. האפליקציה הזו תופעל במצב תואם לגודל הדף. כדי לקבל את התאימות הטובה ביותר, צריך להדר מחדש (recompile) את האפליקציה לתמיכה בדפים בגודל 16KB. מידע נוסף זמין בכתובת <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"האפליקציה הזו לא תואמת לדפים בגודל 16KB. בדיקות ההתאמה ל-APK ול-ELF נכשלו. האפליקציה הזו תופעל במצב תואם לגודל הדף. כדי לקבל את התאימות הטובה ביותר, צריך להדר מחדש (recompile) את האפליקציה לתמיכה בדפים בגודל 16KB. מידע נוסף זמין בכתובת <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"השירות לא הוקצה."</string> <string name="CLIRPermanent" msgid="166443681876381118">"אינך יכול לשנות את הגדרת זיהוי המתקשר."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"הנתונים עברו אל <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"בעוד <xliff:g id="COUNT">%d</xliff:g> שע‘"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"בעוד <xliff:g id="COUNT">%d</xliff:g> י‘"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"בעוד <xliff:g id="COUNT">%d</xliff:g> שנים"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{לפני דקה}one{לפני # דקות}two{לפני # דקות}other{לפני # דקות}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{לפני שעה}one{לפני # שעות}two{לפני שעתיים}other{לפני # שעות}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{לפני יום}one{לפני # ימים}two{לפני יומיים}other{לפני # ימים}}"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 5139e2a1b148..07fa8bffa08f 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1158,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> 時間後"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> 日後"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> 年後"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# 分前}other{# 分前}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# 時間前}other{# 時間前}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# 日前}other{# 日前}}"</string> diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml index 1a0ba5a2fd09..b52896b69646 100644 --- a/core/res/res/values-ka/strings.xml +++ b/core/res/res/values-ka/strings.xml @@ -1158,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> საათში"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> დღეში"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> წელში"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# წუთის წინ}other{# წუთის წინ}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# საათის წინ}other{# საათის წინ}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# დღის წინ}other{# დღის წინ}}"</string> diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml index fd235c2e4d94..384969029f3c 100644 --- a/core/res/res/values-kk/strings.xml +++ b/core/res/res/values-kk/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Қоңырау шалушының жеке анықтағышы бастапқы бойынша шектелген. Келесі қоңырау: Шектелмеген"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Қоңырау шалушының жеке анықтағышы бастапқы бойынша шектелмеген. Келесі қоңырау: Шектелген"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Қоңырау шалушының жеке анықтағышы бастапқы бойынша шектелмеген. Келесі қоңырау: Шектелмеген"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Бұл қолданба 16 КБ көлеміне қолдау көрсетпейді. APK туралау тексерісі орындалмады. Бұл қолданба бет өлшемімен сәйкестік режимінде іске қосылады. Сәйкестікті жақсарту үшін қолданбаны 16 КБ көлемін қолдайтындай етіп қайта құрастырыңыз. Қосымша ақпарат алу үшін <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> сілтемесін қарап шығыңыз."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Бұл қолданба 16 КБ көлеміне қолдау көрсетпейді. ELF туралау тексерісі орындалмады. Бұл қолданба бет өлшемімен сәйкестік режимінде іске қосылады. Сәйкестікті жақсарту үшін қолданбаны 16 КБ көлемін қолдайтындай етіп қайта құрастырыңыз. Қосымша ақпарат алу үшін <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> сілтемесін қарап шығыңыз."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Бұл қолданба 16 КБ көлеміне қолдау көрсетпейді. APK және ELF файлдарының туралау тексерісі орындалмады. Бұл қолданба бет өлшемімен сәйкестік режимінде іске қосылады. Сәйкестікті жақсарту үшін қолданбаны 16 КБ көлемін қолдайтындай етіп қайта құрастырыңыз. Қосымша ақпарат алу үшін <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> сілтемесін қарап шығыңыз."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Қызмет ұсынылмаған."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Қоңырау шалушы идентификаторы параметрін өзгерту мүмкін емес."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Деректер <xliff:g id="CARRIERDISPLAY">%s</xliff:g> операторына ауыстырылды"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> сағ кейін"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> күннен кейін"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> жылдан кейін"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# минут бұрын}other{# минут бұрын}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# сағат бұрын}other{# сағат бұрын}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# күн бұрын}other{# күн бұрын}}"</string> diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml index 2fddb5f21dbb..27299c5ee9f8 100644 --- a/core/res/res/values-km/strings.xml +++ b/core/res/res/values-km/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"មិនបានដាក់កម្រិតលំនាំដើមលេខសម្គាល់អ្នកហៅ។ ការហៅបន្ទាប់៖ មិនបានដាក់កម្រិត។"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"មិនបានដាក់កម្រិតលេខសម្គាល់អ្នកហៅលំនាំដើម។ ការហៅបន្ទាប់៖ បានដាក់កម្រិត"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"មិនបានដាក់កម្រិតលំនាំដើមលេខសម្គាល់អ្នកហៅ។ ការហៅបន្ទាប់៖ មិនបានដាក់កម្រិត។"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"កម្មវិធីនេះមិនត្រូវគ្នានឹង 16 KB ទេ។ ការត្រួតពិនិត្យការតម្រឹម APK មិនបានសម្រេចទេ។ កម្មវិធីនេះនឹងត្រូវបានដំណើរការដោយប្រើមុខងារដែលត្រូវគ្នានឹងទំហំទំព័រ។ ដើម្បីទទួលបានភាពត្រូវគ្នាល្អបំផុត សូមចងក្រងកម្មវិធីឡើងវិញដោយប្រើជំនួយ 16 KB។ ដើម្បីទទួលបានព័ត៌មានបន្ថែម សូមមើល <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"កម្មវិធីនេះមិនត្រូវគ្នានឹង 16 KB ទេ។ ការត្រួតពិនិត្យការតម្រឹម ELF មិនបានសម្រេចទេ។ កម្មវិធីនេះនឹងត្រូវបានដំណើរការដោយប្រើមុខងារដែលត្រូវគ្នានឹងទំហំទំព័រ។ ដើម្បីទទួលបានភាពត្រូវគ្នាល្អបំផុត សូមចងក្រងកម្មវិធីឡើងវិញដោយប្រើជំនួយ 16 KB។ ដើម្បីទទួលបានព័ត៌មានបន្ថែម សូមមើល <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"កម្មវិធីនេះមិនត្រូវគ្នានឹង 16 KB ទេ។ ការត្រួតពិនិត្យការតម្រឹម APK និង ELF មិនបានសម្រេចទេ។ កម្មវិធីនេះនឹងត្រូវបានដំណើរការដោយប្រើមុខងារដែលត្រូវគ្នានឹងទំហំទំព័រ។ ដើម្បីទទួលបានភាពត្រូវគ្នាល្អបំផុត សូមចងក្រងកម្មវិធីឡើងវិញដោយប្រើជំនួយ 16 KB។ ដើម្បីទទួលបានព័ត៌មានបន្ថែម សូមមើល <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"មិនបានផ្ដល់សេវាកម្ម។"</string> <string name="CLIRPermanent" msgid="166443681876381118">"អ្នកមិនអាចប្ដូរការកំណត់លេខសម្គាល់អ្នកហៅបានទេ។"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"បានប្ដូរទិន្នន័យទៅ <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"ក្នុងរយៈពេល <xliff:g id="COUNT">%d</xliff:g>ម៉"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"ក្នុងរយៈពេល <xliff:g id="COUNT">%d</xliff:g>ថ"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"ក្នុងរយៈពេល <xliff:g id="COUNT">%d</xliff:g>ឆ"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# នាទីមុន}other{# នាទីមុន}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ម៉ោងមុន}other{# ម៉ោងមុន}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# ថ្ងៃមុន}other{# ថ្ងៃមុន}}"</string> @@ -1224,7 +1253,7 @@ <string name="rating_label" msgid="1837085249662154601">"{rating,plural, =1{ផ្កាយមួយក្នុងចំណោមផ្កាយ {max}}other{ផ្កាយ # ក្នុងចំណោមផ្កាយ {max}}}"</string> <string name="in_progress" msgid="2149208189184319441">"កំពុងដំណើរការ"</string> <string name="whichApplication" msgid="5432266899591255759">"បញ្ចប់សកម្មភាពដោយប្រើ"</string> - <string name="whichApplicationNamed" msgid="6969946041713975681">"បញ្ចប់សកម្មភាពដោយប្រើ %%1$s"</string> + <string name="whichApplicationNamed" msgid="6969946041713975681">"បញ្ចប់សកម្មភាពដោយប្រើ %1$s"</string> <string name="whichApplicationLabel" msgid="7852182961472531728">"បញ្ចប់សកម្មភាព"</string> <string name="whichViewApplication" msgid="5733194231473132945">"បើកជាមួយ"</string> <string name="whichViewApplicationNamed" msgid="415164730629690105">"បើកជាមួយ %1$s"</string> diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml index 4264717d1bf9..85352bc18fdf 100644 --- a/core/res/res/values-kn/strings.xml +++ b/core/res/res/values-kn/strings.xml @@ -1158,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g>ಗಂ ಯಲ್ಲಿ"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g>ದಿ ದಲ್ಲಿ"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g>ವ ದಲ್ಲಿ"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# ನಿಮಿಷದ ಹಿಂದೆ}one{# ನಿಮಿಷಗಳ ಹಿಂದೆ}other{# ನಿಮಿಷಗಳ ಹಿಂದೆ}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ಗಂಟೆಯ ಹಿಂದೆ}one{# ಗಂಟೆಗಳ ಹಿಂದೆ}other{# ಗಂಟೆಗಳ ಹಿಂದೆ}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# ದಿನದ ಹಿಂದೆ}one{# ದಿನಗಳ ಹಿಂದೆ}other{# ದಿನಗಳ ಹಿಂದೆ}}"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index b8bbacba554e..5a4768367f4e 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"발신자 번호가 기본적으로 제한됨으로 설정됩니다. 다음 통화: 제한되지 않음"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"발신자 번호가 기본적으로 제한되지 않음으로 설정됩니다. 다음 통화: 제한됨"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"발신자 번호가 기본적으로 제한되지 않음으로 설정됩니다. 다음 통화: 제한되지 않음"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"이 앱은 16KB와 호환되지 않습니다. APK 정렬 검사에 실패했습니다. 이 앱은 페이지 크기 호환 모드를 사용하여 실행됩니다. 최상의 호환성을 위해 16KB를 지원하도록 애플리케이션을 다시 컴파일하세요. 자세한 내용은 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>를 참고하세요."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"이 앱은 16KB와 호환되지 않습니다. ELF 정렬 검사에 실패했습니다. 이 앱은 페이지 크기 호환 모드를 사용하여 실행됩니다. 최상의 호환성을 위해 16KB를 지원하도록 애플리케이션을 다시 컴파일하세요. 자세한 내용은 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>를 참고하세요."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"이 앱은 16KB와 호환되지 않습니다. APK 및 ELF 정렬 검사에 실패했습니다. 이 앱은 페이지 크기 호환 모드를 사용하여 실행됩니다. 최상의 호환성을 위해 16KB를 지원하도록 애플리케이션을 다시 컴파일하세요. 자세한 내용은 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>를 참고하세요."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"서비스가 준비되지 않았습니다."</string> <string name="CLIRPermanent" msgid="166443681876381118">"발신자 번호 설정을 변경할 수 없습니다."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"<xliff:g id="CARRIERDISPLAY">%s</xliff:g> 이동통신사로 데이터가 변경됨"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g>시간 후"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g>일 후"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g>년 후"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{#분 전}other{#분 전}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{#시간 전}other{#시간 전}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{#일 전}other{#일 전}}"</string> diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml index 70c4d8eefd02..2ca59918c408 100644 --- a/core/res/res/values-ky/strings.xml +++ b/core/res/res/values-ky/strings.xml @@ -1158,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> с. кийин"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> к. кийин"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> ж. кийин"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# мүнөт мурун}other{# мүнөт мурун}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# саат мурун}other{# саат мурун}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# күн мурун}other{# күн мурун}}"</string> diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml index 837cfc3d2cac..3b234e8be655 100644 --- a/core/res/res/values-lo/strings.xml +++ b/core/res/res/values-lo/strings.xml @@ -1158,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"ໃນ <xliff:g id="COUNT">%d</xliff:g>ຊມ"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"ໃນ <xliff:g id="COUNT">%d</xliff:g>ມ"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"ໃນ <xliff:g id="COUNT">%d</xliff:g>ປ"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# ນາທີກ່ອນ}other{# ນາທີກ່ອນ}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ຊົ່ວໂມງກ່ອນ}other{# ຊົ່ວໂມງກ່ອນ}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# ມື້ກ່ອນ}other{# ມື້ກ່ອນ}}"</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index a2813558aa3c..c1eaa041c06a 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1160,6 +1160,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"po <xliff:g id="COUNT">%d</xliff:g> val."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"po <xliff:g id="COUNT">%d</xliff:g> d."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"po <xliff:g id="COUNT">%d</xliff:g> m."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Prieš # minutę}one{Prieš # minutę}few{Prieš # minutes}many{Prieš # minutės}other{Prieš # minučių}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Prieš # valandą}one{Prieš # valandą}few{Prieš # valandas}many{Prieš # valandos}other{Prieš # valandų}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Prieš # dieną}one{Prieš # dieną}few{Prieš # dienas}many{Prieš # dienos}other{Prieš # dienų}}"</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index a1c134b0dba6..03c7c3c65cb7 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Zvanītāja ID noklusējumi ir iestatīti uz Ierobežots. Nākamais zvans: nav ierobežots"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Zvanītāja ID noklusējumi ir iestatīti uz Nav ierobežots. Nākamais zvans: ierobežots"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Zvanītāja ID noklusējumi ir iestatīti uz Nav ierobežots. Nākamais zvans: nav ierobežots"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Šī lietotne nav saderīga ar 16 KB lapām. APK saskaņošanas pārbaude neizdevās. Šī lietotne tiks palaista, izmantojot ar lapas izmēru saderīgu režīmu. Lai uzlabotu saderību, lūdzu, atkārtoti kompilējiet lietojumprogrammu, nodrošinot atbalstu 16 KB lapām. Plašāku informāciju skatiet vietnē <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Šī lietotne nav saderīga ar 16 KB lapām. ELF saskaņošanas pārbaude neizdevās. Šī lietotne tiks palaista, izmantojot ar lapas izmēru saderīgu režīmu. Lai uzlabotu saderību, lūdzu, atkārtoti kompilējiet lietojumprogrammu, nodrošinot atbalstu 16 KB lapām. Plašāku informāciju skatiet vietnē <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Šī lietotne nav saderīga ar 16 KB lapām. APK un ELF saskaņošanas pārbaudes neizdevās. Šī lietotne tiks palaista, izmantojot ar lapas izmēru saderīgu režīmu. Lai uzlabotu saderību, lūdzu, atkārtoti kompilējiet lietojumprogrammu, nodrošinot atbalstu 16 KB lapām. Plašāku informāciju skatiet vietnē <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Pakalpojums netiek nodrošināts."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Zvanītāja ID iestatījumu nevar mainīt."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Tiek izmantots operatora <xliff:g id="CARRIERDISPLAY">%s</xliff:g> datu savienojums"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"pēc <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"pēc <xliff:g id="COUNT">%d</xliff:g> d."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"pēc <xliff:g id="COUNT">%d</xliff:g> g."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Pirms vienas minūtes}zero{Pirms # minūtēm}one{Pirms vairākām minūtēm, minūšu skaits: #}other{Pirms vairākām minūtēm, minūšu skaits: #}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Pirms vienas stundas}zero{Pirms # stundām}one{Pirms vairākām stundām, stundu skaits: #}other{Pirms vairākām stundām, stundu skaits: #}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Pirms vienas dienas}zero{Pirms # dienām}one{Pirms vairākām dienām, dienu skaits: #}other{Pirms vairākām dienām, dienu skaits: #}}"</string> diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 74e5bf00e704..e299c8b5a7a8 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Стандардно, ID на повикувач е скриен. Следен повик: не е скриен"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Стандардно, ID на повикувач не е скриен. Следен повик: скриен"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Стандардно, ID на повикувач не е скриен. Следен повик: не е скриен"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Апликацијава не е компатибилна со 16 KB. Проверката за усогласување на АПК не успеа. Апликацијава ќе се извршува со режим компатибилен со големината на страницата. За најдобра компатибилност, рекомпилирајте ја апликацијата со поддршка за 16 KB. За повеќе информации, одете на <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Апликацијава не е компатибилна со 16 KB. Проверката за усогласување на ELF не успеа. Апликацијава ќе се извршува со режим компатибилен со големината на страницата. За најдобра компатибилност, рекомпилирајте ја апликацијата со поддршка за 16 KB. За повеќе информации, одете на <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Апликацијава не е компатибилна со 16 KB. Проверките за усогласување на АПК и ELF се неуспешни. Апликацијава ќе се извршува со режим компатибилен со големината на страницата. За најдобра компатибилност, рекомпилирајте ја апликацијата со поддршка за 16 KB. За повеќе информации, одете на <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Услугата не е предвидена."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Не може да го промените поставувањето за ID на повикувач."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Мобилниот интернет се префрли на <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"по <xliff:g id="COUNT">%d</xliff:g> ч."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"по <xliff:g id="COUNT">%d</xliff:g> д."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"по <xliff:g id="COUNT">%d</xliff:g> г."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Пред # минута}one{Пред # минута}other{Пред # минути}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Пред # час}one{Пред # час}other{Пред # часа}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Пред # ден}one{Пред # ден}other{Пред # дена}}"</string> diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml index 37f51c5f80f1..3c08c013d3e3 100644 --- a/core/res/res/values-ml/strings.xml +++ b/core/res/res/values-ml/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"നിയന്ത്രിക്കേണ്ട സ്ഥിര കോളർ ഐഡികൾ. അടുത്ത കോൾ: നിയന്ത്രിച്ചിട്ടില്ല"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"നിയന്ത്രിക്കേണ്ടതല്ലാത്ത സ്ഥിര കോളർ ഐഡികൾ. അടുത്ത കോൾ: നിയന്ത്രിച്ചിട്ടുണ്ട്"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"നിയന്ത്രിക്കേണ്ടതല്ലാത്ത സ്ഥിര കോളർ ഐഡികൾ. അടുത്ത കോൾ: നിയന്ത്രിച്ചിട്ടില്ല"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"ഈ ആപ്പ് 16 KB-ക്ക് അനുയോജ്യമല്ല. APK അലൈൻമെന്റ് പരിശോധന നടത്താനായില്ല. പേജ് വലുപ്പത്തിന് അനുയോജ്യമായ മോഡ് ഉപയോഗിച്ച് ഈ ആപ്പ് റൺ ചെയ്യും. മികച്ച അനുയോജ്യതയ്ക്കായി, 16 KB പിന്തുണയോടെ ആപ്പ് വീണ്ടും കംപൈൽ ചെയ്യുക. കൂടുതൽ വിവരങ്ങൾക്ക്, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> കാണുക"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"ഈ ആപ്പ് 16 KB-ക്ക് അനുയോജ്യമല്ല. ELF അലൈൻമെന്റ് പരിശോധന നടത്താനായില്ല. പേജ് വലുപ്പത്തിന് അനുയോജ്യമായ മോഡ് ഉപയോഗിച്ച് ഈ ആപ്പ് റൺ ചെയ്യും. മികച്ച അനുയോജ്യതയ്ക്കായി, 16 KB പിന്തുണയോടെ ആപ്പ് വീണ്ടും കംപൈൽ ചെയ്യുക. കൂടുതൽ വിവരങ്ങൾക്ക്, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> കാണുക"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"ഈ ആപ്പ് 16 KB-ക്ക് അനുയോജ്യമല്ല. APK, ELF അലൈൻമെന്റ് പരിശോധനകൾ നടത്താനായില്ല. പേജ് വലുപ്പത്തിന് അനുയോജ്യമായ മോഡ് ഉപയോഗിച്ച് ഈ ആപ്പ് റൺ ചെയ്യും. മികച്ച അനുയോജ്യതയ്ക്കായി, 16 KB പിന്തുണയോടെ ആപ്പ് വീണ്ടും കംപൈൽ ചെയ്യുക. കൂടുതൽ വിവരങ്ങൾക്ക്, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> കാണുക"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"സേവനം വ്യവസ്ഥ ചെയ്തിട്ടില്ല."</string> <string name="CLIRPermanent" msgid="166443681876381118">"വിളിച്ച നമ്പർ ക്രമീകരണം നിങ്ങൾക്ക് മാറ്റാനാവില്ല."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"<xliff:g id="CARRIERDISPLAY">%s</xliff:g> എന്നതിലേക്ക് ഡാറ്റ മാറ്റി"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g>മണിക്കൂറിൽ"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g>ദിവസത്തിൽ"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g>വർഷത്തിനുള്ളിൽ"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# മിനിറ്റ് മുമ്പ്}other{# മിനിറ്റ് മുമ്പ്}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# മണിക്കൂർ മുമ്പ്}other{# മണിക്കൂർ മുമ്പ്}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# ദിവസം മുമ്പ്}other{# ദിവസം മുമ്പ്}}"</string> diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml index fce948ec645a..e32eff0f91a1 100644 --- a/core/res/res/values-mn/strings.xml +++ b/core/res/res/values-mn/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Дуудлага хийгчийн ID хязгаарлагдсан. Дараагийн дуудлага: Хязгаарлагдаагүй"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Дуудлага хийгчийн ID хязгаарлагдаагүй. Дараагийн дуудлага: Хязгаарлагдсан"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Дуудлага хийгчийн ID хязгаарлагдсан. Дараагийн дуудлага: Хязгаарлагдсан"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Энэ апп 16 КБ-ын хэмжээтэй хуудастай тохиромжгүй байна. APK эгнүүлэлтийн шалгалт амжилтгүй боллоо. Энэ апп хуудасны хэмжээтэй тохирох горимыг ашиглан ажиллана. Хамгийн тохиромжтой байлгахын тулд 16 КБ-ын дэмжлэгээр аппликэйшнийг дахин хөрвүүлнэ үү. Нэмэлт мэдээлэл авах бол <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> холбоосыг харна уу"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Энэ апп 16 КБ-ын хэмжээтэй хуудастай тохиромжгүй байна. ELF эгнүүлэлтийн шалгалт амжилтгүй боллоо. Энэ апп хуудасны хэмжээтэй тохирох горимыг ашиглан ажиллана. Хамгийн тохиромжтой байлгахын тулд 16 КБ-ын дэмжлэгээр аппликэйшнийг дахин хөрвүүлнэ үү. Нэмэлт мэдээлэл авах бол <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> холбоосыг харна уу"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Энэ апп 16 КБ-ын хэмжээтэй хуудастай тохиромжгүй байна. APK, ELF эгнүүлэлтийн шалгалт амжилтгүй боллоо. Энэ апп хуудасны хэмжээтэй тохирох горимыг ашиглан ажиллана. Хамгийн тохиромжтой байлгахын тулд 16 КБ-ын дэмжлэгээр аппликэйшнийг дахин хөрвүүлнэ үү. Нэмэлт мэдээлэл авах бол <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> холбоосыг харна уу"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Үйлчилгээ провишн хийгдээгүй ."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Та дуудлага хийгчийн ID тохиргоог солиж чадахгүй."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Өгөгдлийг <xliff:g id="CARRIERDISPLAY">%s</xliff:g> руу шилжүүлсэн"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g>цагийн дараа"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g>хоногийн дараа"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g>жилийн дараа"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# минутын өмнө}other{# минутын өмнө}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# цагийн өмнө}other{# цагийн өмнө}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# хоногийн өмнө}other{# хоногийн өмнө}}"</string> diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml index cf763116b49a..abe9a948a063 100644 --- a/core/res/res/values-mr/strings.xml +++ b/core/res/res/values-mr/strings.xml @@ -1158,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> तासांमध्ये"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> दिवसांमध्ये"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> वर्षांमध्ये"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# मिनिटापूर्वी}other{# मिनिटांपूर्वी}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# तासापूर्वी}other{# तासांपूर्वी}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# दिवसापूर्वी}other{# दिवसांपूर्वी}}"</string> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 34d765486e3a..1fea24358ad4 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ID pemanggil secara lalainya ditetapkan kepada terhad. Panggilan seterusnya: Tidak terhad"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ID pemanggil secara lalainya ditetapkan kepada tidak terhad. Panggilan seterusnya: Terhad"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ID pemanggil secara lalainya ditetapkan kepada tidak dihadkan. Panggilan seterusnya: Tidak terhad"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Apl ini tidak serasi untuk 16 KB. Semakan penjajaran APK gagal. Apl ini akan dijalankan menggunakan mod serasi saiz halaman. Untuk keserasian yang terbaik, sila susun semula aplikasi dengan sokongan 16 KB. Untuk mendapatkan maklumat lanjut, lihat <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Apl ini tidak serasi untuk 16 KB. Semakan penjajaran ELF gagal. Apl ini akan dijalankan menggunakan mod serasi saiz halaman. Untuk keserasian yang terbaik, sila susun semula aplikasi dengan sokongan 16 KB. Untuk mendapatkan maklumat lanjut, lihat <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Apl ini tidak serasi untuk 16 KB. Semakan penjajaran APK dan ELF gagal. Apl ini akan dijalankan menggunakan mod serasi saiz halaman. Untuk keserasian yang terbaik, sila susun semula aplikasi dengan sokongan 16 KB. Untuk mendapatkan maklumat lanjut, lihat <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Perkhidmatan yang tidak diuntukkan."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Anda tidak boleh mengubah tetapan ID pemanggil."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Data ditukar kepada <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"dalam <xliff:g id="COUNT">%d</xliff:g>j"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"dalam <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"dalam <xliff:g id="COUNT">%d</xliff:g>t"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minit yang lalu}other{# minit yang lalu}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# jam yang lalu}other{# jam yang lalu}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# hari yang lalu}other{# hari yang lalu}}"</string> diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml index 45be6f5955c1..ec6eff427a19 100644 --- a/core/res/res/values-my/strings.xml +++ b/core/res/res/values-my/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်ထားသည်။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်မထားပါ။"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်မထားပါ။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်ထားသည်။"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်မထားပါ။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်မထားပါ။"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"ဤအက်ပ်သည် ၁၆ KB နှင့် တွဲမသုံးနိုင်ပါ။ APK ချိန်ညှိခြင်း စစ်ဆေးမှု မအောင်မြင်ပါ။ ဤအက်ပ်သည် တွဲသုံးနိုင်သော စာမျက်နှာအရွယ်အစားမုဒ်သုံး၍ လုပ်ဆောင်ပါမည်။ အကောင်းဆုံး တွဲသုံးနိုင်မှုအတွက် အပလီကေးရှင်းကို ၁၆ KB ပံ့ပိုးမှုဖြင့် ပြန်လည်တည်ဆောက်ပါ။ နောက်ထပ်အချက်အလက်အတွက် <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> တွင် ကြည့်ပါ"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"ဤအက်ပ်သည် ၁၆ KB နှင့် တွဲမသုံးနိုင်ပါ။ ELF ချိန်ညှိခြင်း စစ်ဆေးမှု မအောင်မြင်ပါ။ ဤအက်ပ်သည် တွဲသုံးနိုင်သော စာမျက်နှာအရွယ်အစားမုဒ်သုံး၍ လုပ်ဆောင်ပါမည်။ အကောင်းဆုံး တွဲသုံးနိုင်မှုအတွက် အပလီကေးရှင်းကို ၁၆ KB ပံ့ပိုးမှုဖြင့် ပြန်လည်တည်ဆောက်ပါ။ နောက်ထပ်အချက်အလက်အတွက် <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> တွင် ကြည့်ပါ"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"ဤအက်ပ်သည် ၁၆ KB နှင့် တွဲမသုံးနိုင်ပါ။ APK နှင့် ELF ချိန်ညှိခြင်း စစ်ဆေးမှု မအောင်မြင်ပါ။ ဤအက်ပ်သည် တွဲသုံးနိုင်သော စာမျက်နှာအရွယ်အစားမုဒ်သုံး၍ လုပ်ဆောင်ပါမည်။ အကောင်းဆုံး တွဲသုံးနိုင်မှုအတွက် အပလီကေးရှင်းကို ၁၆ KB ပံ့ပိုးမှုဖြင့် ပြန်လည်တည်ဆောက်ပါ။ နောက်ထပ်အချက်အလက်အတွက် <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> တွင် ကြည့်ပါ"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"ဝန်ဆောင်မှုအား ကန့်သတ်မထားပါ"</string> <string name="CLIRPermanent" msgid="166443681876381118">"သင်သည် ခေါ်ဆိုသူ ID ဆက်တင်ကို မပြောင်းလဲနိုင်ပါ။"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"ဒေတာကို <xliff:g id="CARRIERDISPLAY">%s</xliff:g> သို့ ပြောင်းထားသည်"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> နာရီအတွင်း"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> ရက်အတွင်း"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> နှစ်အတွင်း"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{ပြီးခဲ့သော # မိနစ်}other{ပြီးခဲ့သော # မိနစ်}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{ပြီးခဲ့သော # နာရီ}other{ပြီးခဲ့သော # နာရီ}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{ပြီးခဲ့သော # ရက်}other{ပြီးခဲ့သော # ရက်}}"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 910d70d5bbfb..fd80ab4653b8 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Nummervisning er begrenset som standard. Neste anrop: Ikke begrenset"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Nummervisning er ikke begrenset som standard. Neste anrop: Begrenset"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Nummervisning er ikke begrenset som standard. Neste anrop: Ikke begrenset"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Denne appen er ikke kompatibel med 16 kB. Kontrollen av APK-justering mislyktes. Denne appen kjøres i modus for sideformatkompatibilitet. For å få best mulig kompatibilitet bør du kompilere appen på nytt med støtte for 16 kB. Du finner mer informasjon på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Denne appen er ikke kompatibel med 16 kB. Kontrollen av ELF-justering mislyktes. Denne appen kjøres i modus for sideformatkompatibilitet. For å få best mulig kompatibilitet bør du kompilere appen på nytt med støtte for 16 kB. Du finner mer informasjon på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Denne appen er ikke kompatibel med 16 kB. APK- og ELF-justeringskontrollene mislyktes. Denne appen kjøres i modus for sideformatkompatibilitet. For å få best mulig kompatibilitet bør du kompilere appen på nytt med støtte for 16 kB. Du finner mer informasjon på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"SIM-kortet er ikke tilrettelagt for tjenesten."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Du kan ikke endre innstillingen for anrops-ID."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Byttet data til <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"om <xliff:g id="COUNT">%d</xliff:g> t"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"om <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"om <xliff:g id="COUNT">%d</xliff:g> år"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{for # minutt siden}other{For # minutter siden}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# time siden}other{# timer siden}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{For # dag siden}other{For # dager siden}}"</string> diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index 5e6d8507772b..6fabb068759e 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"कलर ID पूर्वनिर्धारितको लागि रोकावट छ। अर्को कल: रोकावट छैन"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"कलर ID पूर्वनिर्धारितदेखि प्रतिबन्धित छैन। अर्को कल: प्रतिबन्धित छ"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"कलर ID पूर्वनिर्धारितको लागि रोकावट छैन। अर्को कल: रोकावट छैन"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"यो एप १६ के.बि. को पेजसँग कम्प्याटिबल छैन। APK को एलाइनमेन्ट जाँच्न सकिएन। यो एप पेजको साइजसँग कम्प्याटिबल मोड प्रयोग गरेर चलाइने छ। उत्कृष्ट कम्प्याटिबिलिटीका लागि कृपया यो एप १६ के.बि. को पेज प्रयोग गर्न मिल्ने गरी रिकम्पलाइल गर्नुहोस्। यस सम्बन्धमा थप जानकारी प्राप्त गर्न <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> हेर्नुहोस्"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"यो एप १६ के.बि. को पेजसँग कम्प्याटिबल छैन। ELF को एलाइनमेन्ट जाँच्न सकिएन। यो एप पेजको साइजसँग कम्प्याटिबल मोड प्रयोग गरेर चलाइने छ। उत्कृष्ट कम्प्याटिबिलिटीका लागि कृपया यो एप १६ के.बि. को पेज प्रयोग गर्न मिल्ने गरी रिकम्पलाइल गर्नुहोस्। यस सम्बन्धमा थप जानकारी प्राप्त गर्न <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> हेर्नुहोस्"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"यो एप १६ के.बि. को पेजसँग कम्प्याटिबल छैन। APK र ELF को एलाइनमेन्ट जाँच्न सकिएन। यो एप पेजको साइजसँग कम्प्याटिबल मोड प्रयोग गरेर चलाइने छ। उत्कृष्ट कम्प्याटिबिलिटीका लागि कृपया यो एप १६ के.बि. को पेज प्रयोग गर्न मिल्ने गरी रिकम्पलाइल गर्नुहोस्। यस सम्बन्धमा थप जानकारी प्राप्त गर्न <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> हेर्नुहोस्"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"सेवाको व्यवस्था छैन।"</string> <string name="CLIRPermanent" msgid="166443681876381118">"तपाईं कलर ID सेटिङ परिवर्तन गर्न सक्नुहुन्न।"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"<xliff:g id="CARRIERDISPLAY">%s</xliff:g> को डेटा प्रयोग गर्न थालिएको छ"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> घण्टाभित्र"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> दिनभित्र"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> वर्षभित्र"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# मिनेटअघि}other{# मिनेटअघि}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# घण्टाअघि}other{# घण्टाअघि}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# दिनअघि}other{# दिनअघि}}"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index b45f6cd56467..b93b916997be 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Beller-ID standaard ingesteld op \'beperkt\'. Volgend gesprek: onbeperkt."</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Beller-ID standaard ingesteld op \'onbeperkt\'. Volgend gesprek: beperkt."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Beller-ID standaard ingesteld op \'onbeperkt\'. Volgend gesprek: onbeperkt."</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Deze app is niet compatibel met 16 KB. APK-uitlijningscontrole mislukt. Deze app wordt uitgevoerd in de compatibele modus voor paginagrootte. Voor de beste compatibiliteit moet je de app opnieuw compileren met ondersteuning voor 16 KB. Zie <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> voor meer informatie."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Deze app is niet compatibel met 16 KB. ELF-uitlijningscontrole mislukt. Deze app wordt uitgevoerd in de compatibele modus voor paginagrootte. Voor de beste compatibiliteit moet je de app opnieuw compileren met ondersteuning voor 16 KB. Zie <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> voor meer informatie."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Deze app is niet compatibel met 16 KB. APK- en ELF-uitlijningscontroles mislukt. Deze app wordt uitgevoerd in de compatibele modus voor paginagrootte. Voor de beste compatibiliteit moet je de app opnieuw compileren met ondersteuning voor 16 KB. Zie <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> voor meer informatie."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Service niet voorzien."</string> <string name="CLIRPermanent" msgid="166443681876381118">"U kunt de instelling voor de beller-ID niet wijzigen."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Mobiele data overgeschakeld naar <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"over <xliff:g id="COUNT">%d</xliff:g> u"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"over <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"over <xliff:g id="COUNT">%d</xliff:g> j"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minuut geleden}other{# minuten geleden}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# uur geleden}other{# uur geleden}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# dag geleden}other{# dagen geleden}}"</string> diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml index 9e57ca32fc04..961822a86bd7 100644 --- a/core/res/res/values-or/strings.xml +++ b/core/res/res/values-or/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"କଲର୍ ଆଇଡି ଡିଫଲ୍ଟ ଭାବରେ ପ୍ରତିବନ୍ଧିତ। ପରବର୍ତ୍ତୀ କଲ୍: ପ୍ରତିବନ୍ଧିତ ନୁହେଁ"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"କଲର୍ ଆଇଡି ଡିଫଲ୍ଟ ଭାବରେ ପ୍ରତିବନ୍ଧିତ ନୁହେଁ। ପରବର୍ତ୍ତୀ କଲ୍: ପ୍ରତିବନ୍ଧିତ"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"କଲର୍ ଆଇଡି ଡିଫଲ୍ଟ ଭାବରେ ପ୍ରତିବନ୍ଧିତ ନୁହେଁ। ପରବର୍ତ୍ତୀ କଲ୍: ପ୍ରତିବନ୍ଧିତ ନୁହେଁ"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"ଏହି ଆପ 16 KB କମ୍ପାଟିବଲ ନୁହେଁ। APK ଆଲାଇନମେଣ୍ଟ ଯାଞ୍ଚ ବିଫଳ ହୋଇଛି। ପୃଷ୍ଠା ସାଇଜ କମ୍ପାଟିବଲ ମୋଡ ବ୍ୟବହାର କରି ଏହି ଆପକୁ ଚଲାଯିବ। ସର୍ବୋତ୍ତମ କମ୍ପାଟିବିଲିଟୀ ପାଇଁ ଦୟାକରି 16 KB ସପୋର୍ଟ ସହ ଆପ୍ଲିକେସନକୁ ପୁଣି କମ୍ପାଇଲ କରନ୍ତୁ। ଅଧିକ ସୂଚନା ପାଇଁ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>କୁ ଦେଖନ୍ତୁ"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"ଏହି ଆପ 16 KB କମ୍ପାଟିବଲ ନୁହେଁ। ELF ଆଲାଇନମେଣ୍ଟ ଯାଞ୍ଚ ବିଫଳ ହୋଇଛି। ପୃଷ୍ଠା ସାଇଜ କମ୍ପାଟିବଲ ମୋଡ ବ୍ୟବହାର କରି ଏହି ଆପକୁ ଚଲାଯିବ। ସର୍ବୋତ୍ତମ କମ୍ପାଟିବିଲିଟୀ ପାଇଁ ଦୟାକରି 16 KB ସପୋର୍ଟ ସହ ଆପ୍ଲିକେସନକୁ ପୁଣି କମ୍ପାଇଲ କରନ୍ତୁ। ଅଧିକ ସୂଚନା ପାଇଁ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>କୁ ଦେଖନ୍ତୁ"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"ଏହି ଆପ 16 KB କମ୍ପାଟିବଲ ନୁହେଁ। APK ଏବଂ ELF ଆଲାଇନମେଣ୍ଟ ଯାଞ୍ଚଗୁଡ଼ିକ ବିଫଳ ହୋଇଛି। ପୃଷ୍ଠା ସାଇଜ କମ୍ପାଟିବଲ ମୋଡ ବ୍ୟବହାର କରି ଏହି ଆପକୁ ଚଲାଯିବ। ସର୍ବୋତ୍ତମ କମ୍ପାଟିବିଲିଟୀ ପାଇଁ ଦୟାକରି 16 KB ସପୋର୍ଟ ସହ ଆପ୍ଲିକେସନକୁ ପୁଣି କମ୍ପାଇଲ କରନ୍ତୁ। ଅଧିକ ସୂଚନା ପାଇଁ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>କୁ ଦେଖନ୍ତୁ"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"ସେବାର ସୁବିଧା ନାହିଁ।"</string> <string name="CLIRPermanent" msgid="166443681876381118">"ଆପଣ କଲର୍ ID ସେଟିଙ୍ଗ ବଦଳାଇପାରିବେ ନାହିଁ।"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"<xliff:g id="CARRIERDISPLAY">%s</xliff:g>କୁ ଡାଟା ସ୍ୱିଚ କରାଯାଇଛି"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> ଘଣ୍ଟାରେ"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> ଦିନରେ"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> ବର୍ଷରେ"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# ମିନିଟ ପୂର୍ବେ}other{# ମିନିଟ ପୂର୍ବେ}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ଘଣ୍ଟା ପୂର୍ବେ}other{# ଘଣ୍ଟା ପୂର୍ବେ}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# ଦିନ ପୂର୍ବେ}other{# ଦିନ ପୂର୍ବେ}}"</string> @@ -1671,7 +1700,7 @@ <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"ହେଡଫୋନ୍"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"ସିଷ୍ଟମ"</string> - <string name="bluetooth_a2dp_audio_route_name" msgid="4214648773120426288">"ବ୍ଲୁଟୂଥ୍ ଅଡିଓ"</string> + <string name="bluetooth_a2dp_audio_route_name" msgid="4214648773120426288">"ବ୍ଲୁଟୁଥ ଅଡିଓ"</string> <string name="wireless_display_route_description" msgid="8297563323032966831">"ୱେୟାର୍ଲେସ୍ ଡିସ୍ପ୍ଲେ"</string> <string name="media_route_button_content_description" msgid="2299223698196869956">"କାଷ୍ଟ କରନ୍ତୁ"</string> <string name="media_route_chooser_title" msgid="6646594924991269208">"ଡିଭାଇସ୍ ସଂଯୋଗ କରନ୍ତୁ"</string> diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml index c7b11e5c3b51..238354adbb66 100644 --- a/core/res/res/values-pa/strings.xml +++ b/core/res/res/values-pa/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ਪ੍ਰਤਿਬੰਧਿਤ ਕਰਨ ਲਈ ਕਾਲਰ ਆਈ.ਡੀ. ਪੂਰਵ-ਨਿਰਧਾਰਤ। ਅਗਲੀ ਕਾਲ: ਪ੍ਰਤਿਬੰਧਿਤ ਨਹੀਂ"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ਪ੍ਰਤਿਬੰਧਿਤ ਨਾ ਕਰਨ ਲਈ ਕਾਲਰ ਆਈ.ਡੀ. ਪੂਰਵ-ਨਿਰਧਾਰਤ। ਅਗਲੀ ਕਾਲ: ਪ੍ਰਤਿਬੰਧਿਤ"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ਪ੍ਰਤਿਬੰਧਿਤ ਨਾ ਕਰਨ ਲਈ ਕਾਲਰ ਆਈ.ਡੀ. ਪੂਰਵ-ਨਿਰਧਾਰਤ। ਅਗਲੀ ਕਾਲ: ਪ੍ਰਤਿਬੰਧਿਤ ਨਹੀਂ"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"ਇਹ ਐਪ 16 KB ਦੇ ਅਨੁਰੂਪ ਨਹੀਂ ਹੈ। APK ਦੀ ਇਕਸਾਰਤਾ ਦੀ ਜਾਂਚ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ। ਇਹ ਐਪ ਪੰਨੇ ਦੇ ਆਕਾਰ ਦੇ ਅਨੁਰੂਪ ਮੋਡ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਚੱਲੇਗੀ। ਬਿਹਤਰ ਅਨੁਰੂਪਤਾ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ 16 KB ਵਾਲੇ ਪੰਨਿਆਂ ਨਾਲ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਮੁੜ-ਸੰਕਲਨ ਕਰੋ। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> ਦੇਖੋ"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"ਇਹ ਐਪ 16 KB ਦੇ ਅਨੁਰੂਪ ਨਹੀਂ ਹੈ। ELF ਦੀ ਇਕਸਾਰਤਾ ਦੀ ਜਾਂਚ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ। ਇਹ ਐਪ ਪੰਨੇ ਦੇ ਆਕਾਰ ਦੇ ਅਨੁਰੂਪ ਮੋਡ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਚੱਲੇਗੀ। ਬਿਹਤਰ ਅਨੁਰੂਪਤਾ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ 16 KB ਵਾਲੇ ਪੰਨਿਆਂ ਨਾਲ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਮੁੜ-ਸੰਕਲਨ ਕਰੋ। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> ਦੇਖੋ"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"ਇਹ ਐਪ 16 KB ਦੇ ਅਨੁਰੂਪ ਨਹੀਂ ਹੈ। APK ਅਤੇ ELF ਦੀ ਇਕਸਾਰਤਾ ਦੀ ਜਾਂਚ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ। ਇਹ ਐਪ ਪੰਨੇ ਦੇ ਆਕਾਰ ਦੇ ਅਨੁਰੂਪ ਮੋਡ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਚੱਲੇਗੀ। ਬਿਹਤਰ ਅਨੁਰੂਪਤਾ ਲਈ, ਕਿਰਪਾ ਕਰਕੇ 16 KB ਵਾਲੇ ਪੰਨਿਆਂ ਨਾਲ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਮੁੜ-ਸੰਕਲਨ ਕਰੋ। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> ਦੇਖੋ"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"ਸੇਵਾ ਪ੍ਰਬੰਧਿਤ ਨਹੀਂ ਹੈ।"</string> <string name="CLIRPermanent" msgid="166443681876381118">"ਤੁਸੀਂ ਕਾਲਰ ਆਈ.ਡੀ. ਸੈਟਿੰਗ ਨਹੀਂ ਬਦਲ ਸਕਦੇ।"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"ਡਾਟੇ ਨੂੰ <xliff:g id="CARRIERDISPLAY">%s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕੀਤਾ ਗਿਆ"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> ਘੰਟੇ ਵਿੱਚ"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> ਦਿਨ ਵਿੱਚ"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> ਸਾਲ ਵਿੱਚ"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# ਮਿੰਟ ਪਹਿਲਾਂ}one{# ਮਿੰਟ ਪਹਿਲਾਂ}other{# ਮਿੰਟ ਪਹਿਲਾਂ}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ਘੰਟਾ ਪਹਿਲਾਂ}one{# ਘੰਟਾ ਪਹਿਲਾਂ}other{# ਘੰਟੇ ਪਹਿਲਾਂ}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# ਦਿਨ ਪਹਿਲਾਂ}one{# ਦਿਨ ਪਹਿਲਾਂ}other{# ਦਿਨ ਪਹਿਲਾਂ}}"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 7a7e159b278a..3d71d7baeaca 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -73,12 +73,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ID rozmówcy ustawiony jest domyślnie na „zastrzeżony”. Następne połączenie: nie zastrzeżony"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ID rozmówcy ustawiony jest domyślnie na „nie zastrzeżony”. Następne połączenie: zastrzeżony"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ID rozmówcy ustawiony jest domyślnie na „nie zastrzeżony”. Następne połączenie: nie zastrzeżony"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Ta aplikacja nie jest zgodna z trybem 16 KB. Sprawdzenie zgodności pliku APK się nie powiodło. Ta aplikacja będzie działać w trybie zgodnym z rozmiarem strony. Aby zapewnić najlepszą zgodność, rekompiluj aplikację, żeby obsługiwała 16 KB. Więcej informacji znajdziesz na stronie <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Ta aplikacja nie jest zgodna z trybem 16 KB. Sprawdzenie zgodności ELF się nie powiodło. Ta aplikacja będzie działać w trybie zgodnym z rozmiarem strony. Aby zapewnić najlepszą zgodność, rekompiluj aplikację, żeby obsługiwała 16 KB. Więcej informacji znajdziesz na stronie <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Ta aplikacja nie jest zgodna z trybem 16 KB. Sprawdzenie zgodności pliku APK i ELF się nie powiodło. Ta aplikacja będzie działać w trybie zgodnym z rozmiarem strony. Aby zapewnić najlepszą zgodność, rekompiluj aplikację, żeby obsługiwała 16 KB. Więcej informacji znajdziesz na stronie <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Usługa nie jest świadczona."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Nie możesz zmienić ustawienia ID rozmówcy."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Przełączono mobilną transmisję danych na: <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1163,6 +1160,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"za <xliff:g id="COUNT">%d</xliff:g> godz."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"za <xliff:g id="COUNT">%d</xliff:g> d."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"za <xliff:g id="COUNT">%d</xliff:g> r."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minutę temu}few{# minuty temu}many{# minut temu}other{# minuty temu}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# godzinę temu}few{# godziny temu}many{# godzin temu}other{# godziny temu}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# dzień temu}few{# dni temu}many{# dni temu}other{# dnia temu}}"</string> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index d33277783fea..8e943db600d1 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"O identificador de chamadas assume o padrão de restrito. Próxima chamada: Não restrita"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"O identificador de chamadas assume o padrão de não restrito. Próxima chamada: Restrita"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"O identificador de chamadas assume o padrão de não restrito. Próxima chamada: Não restrita"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Este app não é compatível com 16 KB. Falha na verificação de alinhamento do APK. Este app será executado usando o modo compatível com o tamanho da página. Para melhorar a compatibilidade, é preciso recompilar o aplicativo com suporte a 16 KB. Para mais informações, consulte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Este app não é compatível com 16 KB. Falha na verificação de alinhamento ELF. Este app será executado usando o modo compatível com o tamanho da página. Para melhorar a compatibilidade, é preciso recompilar o aplicativo com suporte a 16 KB. Para mais informações, consulte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Este app não é compatível com 16 KB. Falha nas verificações de alinhamento do APK e do ELF. Este app será executado usando o modo compatível com o tamanho da página. Para melhorar a compatibilidade, é preciso recompilar o aplicativo com suporte a 16 KB. Para mais informações, consulte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"O serviço não foi habilitado."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Não é possível alterar a configuração do identificador de chamadas."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Dados da <xliff:g id="CARRIERDISPLAY">%s</xliff:g> ativados"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"em <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"em <xliff:g id="COUNT">%d</xliff:g> dias"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"em <xliff:g id="COUNT">%d</xliff:g>a"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minuto atrás}one{# minuto atrás}many{# minutos atrás}other{# minutos atrás}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# hora atrás}one{# hora atrás}many{# horas atrás}other{# horas atrás}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# dia atrás}one{# dia atrás}many{# dias atrás}other{# dias atrás}}"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 8b1d408f8b50..b5ee46060865 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1159,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"em <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"em <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"em <xliff:g id="COUNT">%d</xliff:g> a"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Há # minuto}many{Há # minutos}other{Há # minutos}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{há # hora}many{há # horas}other{há # horas}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Há # dia}many{Há # dias}other{Há # dias}}"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index d33277783fea..8e943db600d1 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"O identificador de chamadas assume o padrão de restrito. Próxima chamada: Não restrita"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"O identificador de chamadas assume o padrão de não restrito. Próxima chamada: Restrita"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"O identificador de chamadas assume o padrão de não restrito. Próxima chamada: Não restrita"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Este app não é compatível com 16 KB. Falha na verificação de alinhamento do APK. Este app será executado usando o modo compatível com o tamanho da página. Para melhorar a compatibilidade, é preciso recompilar o aplicativo com suporte a 16 KB. Para mais informações, consulte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Este app não é compatível com 16 KB. Falha na verificação de alinhamento ELF. Este app será executado usando o modo compatível com o tamanho da página. Para melhorar a compatibilidade, é preciso recompilar o aplicativo com suporte a 16 KB. Para mais informações, consulte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Este app não é compatível com 16 KB. Falha nas verificações de alinhamento do APK e do ELF. Este app será executado usando o modo compatível com o tamanho da página. Para melhorar a compatibilidade, é preciso recompilar o aplicativo com suporte a 16 KB. Para mais informações, consulte <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"O serviço não foi habilitado."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Não é possível alterar a configuração do identificador de chamadas."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Dados da <xliff:g id="CARRIERDISPLAY">%s</xliff:g> ativados"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"em <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"em <xliff:g id="COUNT">%d</xliff:g> dias"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"em <xliff:g id="COUNT">%d</xliff:g>a"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minuto atrás}one{# minuto atrás}many{# minutos atrás}other{# minutos atrás}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# hora atrás}one{# hora atrás}many{# horas atrás}other{# horas atrás}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# dia atrás}one{# dia atrás}many{# dias atrás}other{# dias atrás}}"</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index ed974315eb56..79bfcf49c1c5 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ID-ul apelantului este restricționat în mod prestabilit. Apelul următor: nerestricționat"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ID-ul apelantului este nerestricționat în mod prestabilit. Apelul următor: Restricționat."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ID-ul apelantului este nerestricționat în mod prestabilit. Apelul următor: nerestricționat"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Această aplicație nu este compatibilă cu 16 KB. Verificarea alinierii APK nu a reușit. Aplicația va rula folosind modul compatibil cu dimensiunea paginii. Pentru cea mai bună compatibilitate, recompilează aplicația cu suport pentru 16 KB. Pentru mai multe informații, accesează <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Această aplicație nu este compatibilă cu 16 KB. Verificarea alinierii ELF nu a reușit. Aplicația va rula folosind modul compatibil cu dimensiunea paginii. Pentru cea mai bună compatibilitate, recompilează aplicația cu suport pentru 16 KB. Pentru mai multe informații, accesează <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Această aplicație nu este compatibilă cu 16 KB. Verificările de aliniere APK și ELF nu au reușit. Aplicația va rula folosind modul compatibil cu dimensiunea paginii. Pentru cea mai bună compatibilitate, recompilează aplicația cu suport pentru 16 KB. Pentru mai multe informații, accesează <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Nu se asigură accesul la acest serviciu."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Nu poți modifica setarea pentru ID-ul apelantului."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"S-a trecut la datele mobile <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"în <xliff:g id="COUNT">%d</xliff:g> ore"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"în <xliff:g id="COUNT">%d</xliff:g> z"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"în <xliff:g id="COUNT">%d</xliff:g> ani"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Acum # minut}few{Acum # minute}other{Acum # de minute}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Acum # oră}few{Acum # ore}other{Acum # de ore}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Acum # zi}few{Acum # zile}other{Acum # de zile}}"</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 9b3a7199b1df..2631dabe06fb 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -73,12 +73,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Идентификация абонента по умолчанию запрещена. След. вызов: разрешена"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Идентификация абонента по умолчанию не запрещена. След. вызов: запрещена"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Идентификация абонента по умолчанию не запрещена. След. вызов: разрешена"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Это приложение не поддерживает страничную память объемом 16 КБ. Не удалось проверить выравнивание данных в APK-файле. Приложение будет запущено в режиме совместимости. Чтобы улучшить совместимость, заново скомпилируйте приложение для поддержки страничной памяти объемом 16 КБ. Подробнее: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Это приложение не поддерживает страничную память объемом 16 КБ. Не удалось проверить выравнивание данных в ELF-файле. Приложение будет запущено в режиме совместимости. Чтобы улучшить совместимость, заново скомпилируйте приложение для поддержки страничной памяти объемом 16 КБ. Подробнее: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Это приложение не поддерживает страничную память объемом 16 КБ. Не удалось проверить выравнивание данных в APK- и ELF-файлах. Приложение будет запущено в режиме совместимости. Чтобы улучшить совместимость, заново скомпилируйте приложение для поддержки страничной памяти объемом 16 КБ. Подробнее: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Услуга не предоставляется."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Невозможно изменить параметр идентификатора вызывающего абонента."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Используется мобильный интернет <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1163,6 +1160,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"через <xliff:g id="COUNT">%d</xliff:g> ч."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"через <xliff:g id="COUNT">%d</xliff:g> дн."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"через <xliff:g id="COUNT">%d</xliff:g> г."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# минуту назад}one{# минуту назад}few{# минуты назад}many{# минут назад}other{# минуты назад}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# час назад}one{# час назад}few{# часа назад}many{# часов назад}other{# часа назад}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# день назад}one{# день назад}few{# дня назад}many{# дней назад}other{# дня назад}}"</string> diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml index a02cf028df8a..99b925aa19ba 100644 --- a/core/res/res/values-si/strings.xml +++ b/core/res/res/values-si/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"අමතන්නාගේ ID සුපුරුදු අනුව සීමා වී ඇත. මීළඟ ඇමතුම: සීමා කර නැත"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"අමතන්නාගේ ID සුපුරුදු අනුව සීමා වී නැත. මීළඟ ඇමතුම: සීමා කර ඇත"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"අමතන්නාගේ ID සුපුරුදු අනුව සීමා වී නැත. මීළඟ ඇමතුම: සීමා කර ඇත"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"මෙම යෙදුම 16 KB අනුකූල නොවේ. APK පෙළගැස්වීමේ පරීක්ෂාව අසමත් විය. මෙම යෙදුම පිටු ප්රමාණයට ගැළපෙන ප්රකාරය භාවිතයෙන් ධාවනය වනු ඇත. හොඳම ගැළපුම සඳහා, 16 KB සහාය ඇතිව යෙදුම නැවත සම්පාදනය කරන්න. වැඩිපුර තොරතුරු සඳහා, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> බලන්න"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"මෙම යෙදුම 16 KB අනුකූල නොවේ. ELF පෙළගැස්වීමේ පරීක්ෂාව අසමත් විය. මෙම යෙදුම පිටු ප්රමාණයට ගැළපෙන ප්රකාරය භාවිතයෙන් ධාවනය වනු ඇත. හොඳම ගැළපුම සඳහා, 16 KB සහාය ඇතිව යෙදුම නැවත සම්පාදනය කරන්න. වැඩිපුර තොරතුරු සඳහා, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> බලන්න"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"මෙම යෙදුම 16 KB අනුකූල නොවේ. APK සහ ELF පෙළගැස්වීමේ පරීක්ෂාවන් අසමත් විය. මෙම යෙදුම පිටු ප්රමාණයට ගැළපෙන ප්රකාරය භාවිතයෙන් ධාවනය වනු ඇත. හොඳම ගැළපුම සඳහා, 16 KB සහාය ඇතිව යෙදුම නැවත සම්පාදනය කරන්න. වැඩිපුර තොරතුරු සඳහා, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> බලන්න"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"සේවාවන් සපයා නැත."</string> <string name="CLIRPermanent" msgid="166443681876381118">"අමතන්නාගේ ID සැකසීම ඔබට වෙනස්කල නොහැක."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"දත්ත <xliff:g id="CARRIERDISPLAY">%s</xliff:g> වෙත මාරු කරන ලදි"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"පැ<xliff:g id="COUNT">%d</xliff:g>කින්"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"දි<xliff:g id="COUNT">%d</xliff:g>කින්"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"ව<xliff:g id="COUNT">%d</xliff:g>කින්"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{මිනිත්තු #කට පෙර}one{මිනිත්තු #කට පෙර}other{මිනිත්තු #කට පෙර}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{පැය #කට පෙර}one{පැය #කට පෙර}other{පැය #කට පෙර}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{දින #කට පෙර}one{දින #කට පෙර}other{දින #කට පෙර}}"</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index fd2c7276d615..3277781640f6 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -73,12 +73,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"V predvolenom nastavení je identifikácia volajúceho obmedzená. Ďalší hovor: Bez obmedzenia"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"V predvolenom nastavení nie je identifikácia volajúceho obmedzená. Ďalší hovor: Obmedzené"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"V predvolenom nastavení nie je identifikácia volajúceho obmedzená. Ďalší hovor: Bez obmedzenia"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Táto aplikácia nie je kompatibilná s režimom 16 kB. Nepodarilo sa skontrolovať zarovnanie súboru APK. Táto aplikácia bude spustená v režime kompatibilnom s veľkosťou stránky. Ak chcete dosiahnuť najlepšiu kompatibilitu, znova skompilujte aplikáciu s podporou 16 kB. Viac sa dozviete na <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Táto aplikácia nie je kompatibilná s režimom 16 kB. Nepodarilo sa skontrolovať zarovnanie formátu ELF. Táto aplikácia bude spustená v režime kompatibilnom s veľkosťou stránky. Ak chcete dosiahnuť najlepšiu kompatibilitu, znova skompilujte aplikáciu s podporou 16 kB. Viac sa dozviete na <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Táto aplikácia nie je kompatibilná s režimom 16 kB. Nepodarilo sa skontrolovať zarovnanie súboru APK a formátu ELF. Táto aplikácia bude spustená v režime kompatibilnom s veľkosťou stránky. Ak chcete dosiahnuť najlepšiu kompatibilitu, znova skompilujte aplikáciu s podporou 16 kB. Viac sa dozviete na <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Služba nie je poskytovaná."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Nemôžete meniť nastavenie identifikácie volajúcich."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Dátové pripojenie bolo prepnuté na operátora <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1163,6 +1160,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"o <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"o <xliff:g id="COUNT">%d</xliff:g> d."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"o <xliff:g id="COUNT">%d</xliff:g> r."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Pred # minútou}few{Pred # minútami}many{Pred # minúty}other{Pred # minútami}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Pred # hodinou}few{Pred # hodinami}many{Pred # hodiny}other{Pred # hodinami}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Pred # dňom}few{Pred # dňami}many{Pred # dňa}other{Pred # dňami}}"</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 51803b098adb..dc61496dfca3 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1160,6 +1160,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"čez <xliff:g id="COUNT">%d</xliff:g> h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"čez <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"čez <xliff:g id="COUNT">%d</xliff:g> l"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Pred # minuto}one{Pred # minuto}two{Pred # minutama}few{Pred # minutami}other{Pred # minutami}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Pred # uro}one{Pred # uro}two{Pred # urama}few{Pred # urami}other{Pred # urami}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Pred # dnevom}one{Pred # dnevom}two{Pred # dnevoma}few{Pred # dnevi}other{Pred # dnevi}}"</string> diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml index 995910a87045..44981bb37708 100644 --- a/core/res/res/values-sq/strings.xml +++ b/core/res/res/values-sq/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ID-ja e telefonuesit kalon me paracaktim në listën e të telefonuesve të kufizuar. Telefonata e radhës: e pakufizuar!"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ID-ja e telefonuesit kalon me paracaktim në listën e të telefonuesve të pakufizuar. Telefonata e radhës: e kufizuar!"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ID-ja e telefonuesit kalon me paracaktim në listën e të telefonuesve të pakufizuar. Telefonata e radhës: e pakufizuar!"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Ky aplikacion nuk është i përputhshëm me modalitetin 16 KB. Kontrolli i drejtvendosjes për APK dështoi. Ky aplikacion do të ekzekutohet duke përdorur modalitetin në përputhje me madhësinë e faqes. Për përputhshmërinë më të mirë, ripërpiloje aplikacionin me mbështetjen e modalitetit 16 KB. Për më shumë informacione, shiko <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Ky aplikacion nuk është i përputhshëm me modalitetin 16 KB. Kontrolli i drejtvendosjes për ELF dështoi. Ky aplikacion do të ekzekutohet duke përdorur modalitetin në përputhje me madhësinë e faqes. Për përputhshmërinë më të mirë, ripërpiloje aplikacionin me mbështetjen e modalitetit 16 KB. Për më shumë informacione, shiko <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Ky aplikacion nuk është i përputhshëm me modalitetin 16 KB. Kontrollet e drejtvendosjes për APK dhe ELF dështuan. Ky aplikacion do të ekzekutohet duke përdorur modalitetin në përputhje me madhësinë e faqes. Për përputhshmërinë më të mirë, ripërpiloje aplikacionin me mbështetjen e modalitetit 16 KB. Për më shumë informacione, shiko <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Shërbimi nuk është përgatitur."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Nuk mund ta ndryshosh cilësimin e ID-së së telefonuesit."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Të dhënat u kaluan te <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"për <xliff:g id="COUNT">%d</xliff:g> orë"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"për <xliff:g id="COUNT">%d</xliff:g> ditë"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"për <xliff:g id="COUNT">%d</xliff:g> vit"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minutë më parë}other{# minuta më parë}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# orë më parë}other{# orë më parë}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# ditë më parë}other{# ditë më parë}}"</string> @@ -1671,7 +1700,7 @@ <string name="default_audio_route_name_headphones" msgid="6954070994792640762">"Kufjet"</string> <string name="default_audio_route_name_usb" msgid="895668743163316932">"USB"</string> <string name="default_audio_route_category_name" msgid="5241740395748134483">"Sistemi"</string> - <string name="bluetooth_a2dp_audio_route_name" msgid="4214648773120426288">"Audioja e Bluetooth-it"</string> + <string name="bluetooth_a2dp_audio_route_name" msgid="4214648773120426288">"Audioja me Bluetooth"</string> <string name="wireless_display_route_description" msgid="8297563323032966831">"Ekran wireless"</string> <string name="media_route_button_content_description" msgid="2299223698196869956">"Transmeto"</string> <string name="media_route_chooser_title" msgid="6646594924991269208">"Lidhu me pajisjen"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 7ce7b7b47b76..cc2248c02229 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -72,12 +72,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"ИД позиваоца је подразумевано ограничен. Следећи позив: Није ограничен."</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"ИД позиваоца подразумевано није ограничен. Следећи позив: ограничен."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"ИД позиваоца подразумевано није ограничен. Следећи позив: Није ограничен."</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Ова апликација није компатибилна са величином странице од 16 kB. Провера усклађености APK-а није успела. Ова апликација ће радити помоћу режима компатибилног са величином странице. Да бисте обезбедили најбољу компатибилност, поново компајлирајте апликацију са подршком за величину странице од 16 kB. Више информација потражите на <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Ова апликација није компатибилна са величином странице од 16 kB. Провера усклађености ELF-а није успела. Ова апликација ће радити помоћу режима компатибилног са величином странице. Да бисте обезбедили најбољу компатибилност, поново компајлирајте апликацију са подршком за величину странице од 16 kB. Више информација потражите на <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Ова апликација није компатибилна са величином странице од 16 kB. Провере усклађености APK-а и ELF-а нису успеле. Ова апликација ће радити помоћу режима компатибилног са величином странице. Да бисте обезбедили најбољу компатибилност, поново компајлирајте апликацију са подршком за величину странице од 16 kB. Више информација потражите на <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Услуга није добављена."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Не можете да промените подешавање ИД-а корисника."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Мобилни подаци су пребачени на оператера <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1162,6 +1159,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"за <xliff:g id="COUNT">%d</xliff:g> с"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"за <xliff:g id="COUNT">%d</xliff:g> д"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"за <xliff:g id="COUNT">%d</xliff:g> год"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Пре # минут}one{Пре # минут}few{Пре # минута}other{Пре # минута}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Пре # сат}one{Пре # сат}few{Пре # сата}other{Пре # сати}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Пре # дан}one{Пре # дан}few{Пре # дана}other{Пре # дана}}"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index a9a606721d12..a7207ac8156e 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Nummerpresentatörens standardinställning är blockerad. Nästa samtal: Inte blockerad"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Nummerpresentatörens standardinställning är inte blockerad. Nästa samtal: Blockerad"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Nummerpresentatörens standardinställning är inte blockerad. Nästa samtal: Inte blockerad"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Den här appen är inte kompatibel med 16 KB. APK-justeringskontrollen misslyckades. Appen körs i kompatibilitetsläget för sidstorlek. För bästa möjliga kompatibilitet bör du kompilera appen igen med stöd för 16 kB. Läs mer på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Den här appen är inte kompatibel med 16 KB. ELF-justeringskontrollen misslyckades. Appen körs i kompatibilitetsläget för sidstorlek. För bästa möjliga kompatibilitet bör du kompilera appen igen med stöd för 16 kB. Läs mer på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Den här appen är inte kompatibel med 16 kB. APK- och ELF-justeringskontrollerna misslyckades. Appen körs i kompatibilitetsläget för sidstorlek. För bästa möjliga kompatibilitet bör du kompilera appen igen med stöd för 16 kB. Läs mer på <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Tjänsten är inte etablerad."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Det går inte att ändra inställningen för nummerpresentatör."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Du har bytt mobildata till <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"om <xliff:g id="COUNT">%d</xliff:g> tim"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"om <xliff:g id="COUNT">%d</xliff:g> d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"om <xliff:g id="COUNT">%d</xliff:g> år"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{För # minut sedan}other{För # minuter sedan}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{För # timme sedan}other{För # timmar sedan}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{För # dag sedan}other{För # dagar sedan}}"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 4d0d7dc7b465..a7d4d863187d 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Chaguomsingi za kitambulisho cha mpigaji simu huwa kuzuiwa. Simu ifuatayo: Haijazuiliwa"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Chaguomsingi za ID ya mpigaji simu za kutozuia. Simu ifuatayo:Imezuiliwa"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Chaguomsingi za ID ya mpigaji simu za kutozuia. Simu ifuatayo: Haijazuiliwa"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Programu hii haioani na ukubwa wa ukurasa wa KB 16. Imeshindwa kukagua mpangilio wa APK. Programu hii itaendeshwa katika hali inayooana na ukubwa wa ukurasa. Tafadhali rekebisha mipangilio ya programu ijumuishe KB 16 ili ioane vizuri. Tembelea <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> upate maelezo zaidi"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Programu hii haioani na ukubwa wa ukurasa wa KB 16. Imeshindwa kukagua mpangilio wa ELF. Programu hii itaendeshwa katika hali inayooana na ukubwa wa ukurasa. Tafadhali rekebisha mipangilio ya programu ijumuishe KB 16 ili ioane vizuri. Tembelea <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> upate maelezo zaidi"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Programu hii haioani na ukubwa wa ukurasa wa KB 16. Imeshindwa kukagua mpangilio wa APK na ELF. Programu hii itaendeshwa katika hali inayooana na ukubwa wa ukurasa. Tafadhali rekebisha mipangilio ya programu ijumuishe KB 16 ili ioane vizuri. Tembelea <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> upate maelezo zaidi"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Huduma haitathminiwi."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Hauwezi kubadilisha mpangilio wa kitambulisho cha anayepiga."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Sasa unatumia data ya mtandao wa <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"baada ya saa <xliff:g id="COUNT">%d</xliff:g>"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"baada ya siku <xliff:g id="COUNT">%d</xliff:g>"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"baada ya mwaka <xliff:g id="COUNT">%d</xliff:g>"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{Dakika # iliyopita}other{Dakika # zilizopita}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{Saa # iliyopita}other{Saa # zilizopita}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{Siku # iliyopita}other{Siku # zilizopita}}"</string> diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml index 96e62f20e6e2..6107dbee9b26 100644 --- a/core/res/res/values-ta/strings.xml +++ b/core/res/res/values-ta/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"அழைப்பாளர் ஐடி ஆனது வரையறுக்கப்பட்டது என்பதற்கு இயல்பாக அமைக்கப்பட்டது. அடுத்த அழைப்பு: வரையறுக்கப்படவில்லை"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"அழைப்பாளர் ஐடி ஆனது வரையறுக்கப்படவில்லை என்பதற்கு இயல்பாக அமைக்கப்பட்டது. அடுத்த அழைப்பு: வரையறுக்கப்பட்டது"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"அழைப்பாளர் ஐடி ஆனது வரையறுக்கப்படவில்லை என்பதற்கு இயல்பாக அமைக்கப்பட்டது. அடுத்த அழைப்பு: வரையறுக்கப்படவில்லை"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"இந்த ஆப்ஸ் 16 KB இணக்கத்தன்மை வாய்ந்தது அல்ல. APK சீரமைவைச் சரிபார்க்க முடியவில்லை. பக்க அளவுடனான இணக்கத்தன்மைப் பயன்முறையைப் பயன்படுத்தி இந்த ஆப்ஸ் இயக்கப்படும். சிறந்த இணக்கத்தன்மைக்கு, ஆப்ஸை 16 KB ஆதரவுடன் ரீ-கம்பைல் செய்யவும். கூடுதல் தகவல்களுக்கு, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> எனும் பக்கத்தைப் பார்க்கவும்."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"இந்த ஆப்ஸ் 16 KB இணக்கத்தன்மை வாய்ந்தது அல்ல. ELF சீரமைவைச் சரிபார்க்க முடியவில்லை. பக்க அளவுடனான இணக்கத்தன்மைப் பயன்முறையைப் பயன்படுத்தி இந்த ஆப்ஸ் இயக்கப்படும். சிறந்த இணக்கத்தன்மைக்கு, ஆப்ஸை 16 KB ஆதரவுடன் ரீ-கம்பைல் செய்யவும். கூடுதல் தகவல்களுக்கு, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> எனும் பக்கத்தைப் பார்க்கவும்."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"இந்த ஆப்ஸ் 16 KB இணக்கத்தன்மை வாய்ந்தது அல்ல. APK மற்றும் ELF சீரமைவுகளைச் சரிபார்க்க முடியவில்லை. பக்க அளவுடனான இணக்கத்தன்மைப் பயன்முறையைப் பயன்படுத்தி இந்த ஆப்ஸ் இயக்கப்படும். சிறந்த இணக்கத்தன்மைக்கு, ஆப்ஸை 16 KB ஆதரவுடன் ரீ-கம்பைல் செய்யவும். கூடுதல் தகவல்களுக்கு, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> எனும் பக்கத்தைப் பார்க்கவும்."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"சேவை ஒதுக்கப்படவில்லை."</string> <string name="CLIRPermanent" msgid="166443681876381118">"அழைப்பாளர் ஐடி அமைப்பை மாற்ற முடியாது."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"டேட்டா <xliff:g id="CARRIERDISPLAY">%s</xliff:g>க்கு மாற்றப்பட்டது"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> மணிநேரத்தில்"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> நாட்களில்"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> ஆண்டில்"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# நிமிடத்திற்கு முன்பு}other{# நிமிடங்களுக்கு முன்பு}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# மணிநேரத்திற்கு முன்பு}other{# மணிநேரத்திற்கு முன்பு}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# நாளுக்கு முன்பு}other{# நாட்களுக்கு முன்பு}}"</string> diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml index 9495a96f6db6..53ef42a784af 100644 --- a/core/res/res/values-te/strings.xml +++ b/core/res/res/values-te/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"కాలర్ ID ఆటోమేటిక్లపై పరిమితి ఉంటుంది. తర్వాత కాల్: పరిమితి లేదు"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"కాలర్ ID ఆటోమేటిక్లపై పరిమితి లేదు. తర్వాత కాల్: పరిమితి ఉంటుంది"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"కాలర్ ID ఆటోమేటిక్లపై పరిమితి లేదు. తర్వాత కాల్: పరిమితి లేదు"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"ఈ యాప్ 16 KBకి అనుకూలమైనది కాదు. APK అమరిక చెకింగ్ విఫలమైంది. ఈ యాప్ పేజీ సైజ్ అనుకూల మోడ్ను ఉపయోగించి రన్ అవుతుంది. సరైన అనుకూలత కోసం, దయచేసి 16 KB సపోర్ట్తో అప్లికేషన్ను మళ్లీ కంపైల్ చేయండి. మరింత సమాచారం కోసం, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> ను చూడండి"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"ఈ యాప్ 16 KBకి అనుకూలమైనది కాదు. ELF అమరిక చెకింగ్ విఫలమైంది. ఈ యాప్ పేజీ సైజ్ అనుకూల మోడ్ను ఉపయోగించి రన్ అవుతుంది. సరైన అనుకూలత కోసం, దయచేసి 16 KB సపోర్ట్తో అప్లికేషన్ను మళ్లీ కంపైల్ చేయండి. మరింత సమాచారం కోసం, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> ను చూడండి"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"ఈ యాప్ 16 KBకి అనుకూలమైనది కాదు. APK, ELF అమరిక చెకప్ దశలు విఫలమయ్యాయి. ఈ యాప్ పేజీ సైజ్ అనుకూల మోడ్ను ఉపయోగించి రన్ అవుతుంది. సరైన అనుకూలత కోసం, దయచేసి 16 KB సపోర్ట్తో అప్లికేషన్ను మళ్లీ కంపైల్ చేయండి. మరింత సమాచారం కోసం, <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> ను చూడండి"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"సేవ కేటాయించబడలేదు."</string> <string name="CLIRPermanent" msgid="166443681876381118">"మీరు కాలర్ ID సెట్టింగ్ను మార్చలేరు."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"డేటాను <xliff:g id="CARRIERDISPLAY">%s</xliff:g>కు స్విచ్ చేశారు"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g>గంటలో"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g>రోజులో"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g>సంవత్సరంలో"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# నిమిషం క్రితం}other{# నిమిషాల క్రితం}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# గంట క్రితం}other{# గంటల క్రితం}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# రోజు క్రితం}other{# రోజుల క్రితం}}"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 86931c07b94c..43b142357998 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"หมายเลขผู้โทรได้รับการตั้งค่าเริ่มต้นเป็นถูกจำกัด การโทรครั้งต่อไป: ไม่จำกัด"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"หมายเลขผู้โทรได้รับการตั้งค่าเริ่มต้นเป็นไม่จำกัด การโทรครั้งต่อไป: ถูกจำกัด"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"หมายเลขผู้โทรได้รับการตั้งค่าเริ่มต้นเป็นไม่จำกัด การโทรครั้งต่อไป: ไม่จำกัด"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"แอปนี้ไม่รองรับขนาดหน้า 16 KB ผลการตรวจสอบการจัดตำแหน่ง APK คือไม่ผ่าน ด้วยเหตุนี้ แอปจะทำงานโดยใช้โหมดการใช้งานร่วมกับขนาดหน้าได้ เพื่อให้ใช้งานร่วมกันได้อย่างดีที่สุด โปรดคอมไพล์แอปพลิเคชันอีกครั้งโดยมีการรองรับขนาดหน้า 16 KB ดูข้อมูลเพิ่มเติมได้ที่ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"แอปนี้ไม่รองรับขนาดหน้า 16 KB ผลการตรวจสอบการจัดตำแหน่ง ELF คือไม่ผ่าน ด้วยเหตุนี้ แอปจะทำงานโดยใช้โหมดการใช้งานร่วมกับขนาดหน้าได้ เพื่อให้ใช้งานร่วมกันได้อย่างดีที่สุด โปรดคอมไพล์แอปพลิเคชันอีกครั้งโดยมีการรองรับขนาดหน้า 16 KB ดูข้อมูลเพิ่มเติมได้ที่ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"แอปนี้ไม่รองรับขนาดหน้า 16 KB ผลการตรวจสอบการจัดตำแหน่งของ APK และ ELF คือไม่ผ่าน ด้วยเหตุนี้ แอปจะทำงานโดยใช้โหมดการใช้งานร่วมกับขนาดหน้าได้ เพื่อให้ใช้งานร่วมกันได้อย่างดีที่สุด โปรดคอมไพล์แอปพลิเคชันอีกครั้งโดยมีการรองรับขนาดหน้า 16 KB ดูข้อมูลเพิ่มเติมได้ที่ <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"ไม่มีการนำเสนอบริการ"</string> <string name="CLIRPermanent" msgid="166443681876381118">"คุณไม่สามารถเปลี่ยนการตั้งค่าหมายเลขผู้โทร"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"เปลี่ยนไปใช้อินเทอร์เน็ตมือถือของ <xliff:g id="CARRIERDISPLAY">%s</xliff:g> แล้ว"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"ใน <xliff:g id="COUNT">%d</xliff:g> ชม."</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"ใน <xliff:g id="COUNT">%d</xliff:g> วัน"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"ใน <xliff:g id="COUNT">%d</xliff:g> ปี"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# นาทีที่ผ่านมา}other{# นาทีที่ผ่านมา}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# ชั่วโมงที่ผ่านมา}other{# ชั่วโมงที่ผ่านมา}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# วันที่ผ่านมา}other{# วันที่ผ่านมา}}"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 461050e1191b..1dbd00bed90a 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Nade-default sa pinaghihigpitan ang Caller ID. Susunod na tawag: hindi pinaghihigpitan"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Naka-default sa hindi pinaghihigpitan ang Caller ID. Susunod na tawag: Pinaghihigpitan"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Naka-default na hindi pinaghihigpitan ang Caller ID. Susunod na tawag: Hindi pinaghihigpitan"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Hindi 16 KB compatible ang app na ito. Hindi pumasa ang alignment check sa APK. Patatakbuhin ang app na ito gamit ang page size compatible mode. Para sa pinakamahusay na compatibility, paki-recompile ang application nang may suporta sa 16 KB. Para sa higit pang impormasyon, tingnan ang <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Hindi 16 KB compatible ang app na ito. Hindi pumasa ang alignment check sa ELF. Patatakbuhin ang app na ito gamit ang page size compatible mode. Para sa pinakamahusay na compatibility, paki-recompile ang application nang may suporta sa 16 KB. Para sa higit pang impormasyon, tingnan ang <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Hindi 16 KB compatible ang app na ito. Hindi pumasa ang mga alignment check sa APK at ELF. Patatakbuhin ang app na ito gamit ang page size compatible mode. Para sa pinakamahusay na compatibility, paki-recompile ang application nang may suporta sa 16 KB. Para sa higit pang impormasyon, tingnan ang <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Hindi naprobisyon ang serbisyo."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Hindi mo mababago ang setting ng caller ID."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Nailipat sa <xliff:g id="CARRIERDISPLAY">%s</xliff:g> ang data"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"sa <xliff:g id="COUNT">%d</xliff:g>h"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"sa <xliff:g id="COUNT">%d</xliff:g>d"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"sa <xliff:g id="COUNT">%d</xliff:g>y"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# minuto ang nakalipas}one{# minuto ang nakalipas}other{# na minuto ang nakalipas}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# oras ang nakalipas}one{# oras ang nakalipas}other{# na oras ang nakalipas}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# araw ang nakalipas}one{# araw ang nakalipas}other{# na araw ang nakalipas}}"</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index bc90fe1ce1e4..3777f04ca136 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Arayan kimliği varsayılanları kısıtlanmıştır. Sonraki çağrı: Kısıtlanmamış"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Arayan kimliği varsayılanları kısıtlanmamıştır. Sonraki çağrı: Kısıtlanmış"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Arayan kimliği varsayılanları kısıtlanmamıştır. Sonraki çağrı: Kısıtlanmamış"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Bu uygulama 16 KB ile uyumlu değil. APK uyumluluk kontrolü başarısız oldu. Bu uygulama, sayfa boyutuna uyumlu mod kullanılarak çalıştırılacak. En iyi uyumluluk için lütfen uygulamayı 16 KB desteğiyle yeniden derleyin. Daha fazla bilgi için <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> adresini ziyaret edin."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Bu uygulama 16 KB ile uyumlu değil. ELF uyumluluk kontrolü başarısız oldu. Bu uygulama, sayfa boyutuna uyumlu mod kullanılarak çalıştırılacak. En iyi uyumluluk için lütfen uygulamayı 16 KB desteğiyle yeniden derleyin. Daha fazla bilgi için <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> adresini ziyaret edin."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Bu uygulama 16 KB ile uyumlu değil. APK ve ELF uyumluluk kontrolleri başarısız oldu. Bu uygulama, sayfa boyutuna uyumlu mod kullanılarak çalıştırılacak. En iyi uyumluluk için lütfen uygulamayı 16 KB desteğiyle yeniden derleyin. Daha fazla bilgi için <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> adresini ziyaret edin."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Hizmet sağlanamadı."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Arayanın kimliği ayarını değiştiremezsiniz."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Veriler şuraya aktarıldı: <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> saat içinde"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> gün içinde"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> yıl içinde"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# dakika önce}other{# dakika önce}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# saat önce}other{# saat önce}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# gün önce}other{# gün önce}}"</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 8b5a32101312..3d603e34c395 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -73,12 +73,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Ідентиф. абонента за умовч. обмеж. Наст. дзвінок: не обмеж."</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Ідентиф. абонента за умовч. не обмеж. Наст. дзвінок: обмеж."</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Ідентиф. абонента за умовч. не обмеж. Наст. дзвінок: не обмежений"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Цей додаток несумісний зі сторінками пам’яті з розміром 16 КБ. Не вдалося виконати перевірку вирівнювання APK. Цей додаток працюватиме в режимі сумісності з розміром сторінки. Для оптимальної сумісності перекомпілюйте додаток так, щоб він підтримував сторінки пам’яті з розміром 16 КБ. Щоб дізнатися більше, перегляньте статтю <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Цей додаток несумісний зі сторінками пам’яті з розміром 16 КБ. Не вдалося виконати перевірку вирівнювання ELF. Цей додаток працюватиме в режимі сумісності з розміром сторінки. Для оптимальної сумісності перекомпілюйте додаток так, щоб він підтримував сторінки пам’яті з розміром 16 КБ. Щоб дізнатися більше, перегляньте статтю <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Цей додаток несумісний зі сторінками пам’яті з розміром 16 КБ. Не вдалося виконати перевірку вирівнювання APK і ELF. Цей додаток працюватиме в режимі сумісності з розміром сторінки. Для оптимальної сумісності перекомпілюйте додаток так, щоб він підтримував сторінки пам’яті з розміром 16 КБ. Щоб дізнатися більше, перегляньте статтю <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>."</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Службу не ініціалізовано."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Ви не можете змінювати налаштування ідентифікатора абонента."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Мобільний Інтернет переключено на <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1163,6 +1160,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"через <xliff:g id="COUNT">%d</xliff:g> год"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"через <xliff:g id="COUNT">%d</xliff:g> дн."</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"через <xliff:g id="COUNT">%d</xliff:g> р."</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# хвилину тому}one{# хвилину тому}few{# хвилини тому}many{# хвилин тому}other{# хвилини тому}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# годину тому}one{# годину тому}few{# години тому}many{# годин тому}other{# години тому}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# день тому}one{# день тому}few{# дні тому}many{# днів тому}other{# дня тому}}"</string> diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml index ae813281c6ed..8a9c661658a3 100644 --- a/core/res/res/values-ur/strings.xml +++ b/core/res/res/values-ur/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"کالر ID کی ڈیفالٹ ترتیب محدود کردہ ہے۔ اگلی کال: غیر محدود کردہ"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"کالر ID کی ڈیفالٹ ترتیب غیر محدود کردہ ہے۔ اگلی کال: محدود کردہ"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"کالر ID کی ڈیفالٹ ترتیب غیر محدود کردہ ہے۔ اگلی کال: غیر محدود کردہ"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"یہ ایپ 16 KB کے موافق نہیں ہے۔ APK الائنمنٹ چیک ناکام ہو گیا۔ یہ ایپ صفحہ کے سائز کے ساتھ موافقت رکھنے والے موڈ کے ساتھ چلے گی۔ بہترین موافقت کے لیے، براہ کرم 16 KB کے سپورٹ کے ساتھ ایپلیکیشن کو دوبارہ مرتب کریں۔ مزید معلومات کے لیے، <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> دیکھیں"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"یہ ایپ 16 KB کے موافق نہیں ہے۔ ELF الائنمنٹ چیک ناکام ہو گیا۔ یہ ایپ صفحہ کے سائز کے ساتھ موافقت رکھنے والے موڈ کے ساتھ چلے گی۔ بہترین موافقت کے لیے، براہ کرم 16 KB کے سپورٹ کے ساتھ ایپلیکیشن کو دوبارہ مرتب کریں۔ مزید معلومات کے لیے، <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> دیکھیں"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"یہ ایپ 16 KB کے موافق نہیں ہے۔ APK اور ELF الائنمنٹ چیکس ناکام ہو گئے۔ یہ ایپ صفحہ کے سائز کے ساتھ موافقت رکھنے والے موڈ کے ساتھ چلے گی۔ بہترین موافقت کے لیے، براہ کرم 16 KB کے سپورٹ کے ساتھ ایپلیکیشن کو دوبارہ مرتب کریں۔ مزید معلومات کے لیے، <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a> دیکھیں"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"سروس فراہم نہیں کی گئی۔"</string> <string name="CLIRPermanent" msgid="166443681876381118">"آپ کالر ID کی ترتیبات تبدیل نہیں کر سکتے ہیں۔"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"ڈیٹا <xliff:g id="CARRIERDISPLAY">%s</xliff:g> پر سوئچ کیا گیا"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> گھنٹے میں"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> دن میں"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> سال میں"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# منٹ پہلے}other{# منٹ پہلے}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# گھنٹہ پہلے}other{# گھنٹے پہلے}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# دن پہلے}other{# دن پہلے}}"</string> diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index 54b51d979022..28f06ab64d15 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Qo‘ng‘iroq qiluvchi ma’lumotlari cheklangan. Keyingi qo‘ng‘iroq: cheklanmagan"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Qo‘ng‘iroq qiluvchi ma’lumotlari cheklanmagan. Keyingi qo‘ng‘iroq: cheklangan"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Qo‘ng‘iroq qiluvchi ma’lumotlari cheklanmagan. Keyingi qo‘ng‘iroq: cheklanmagan"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Bu ilova 16 KB sahifa hajmi bilan mos emas. APK fayllardagi maʼlumotlarning tekislanishi tekshirilmadi. Bu ilova sahifa hajmiga mos rejimda ishlaydi. Eng yaxshi moslik uchun ilovani 16 KB sahifa hajmi bilan qayta kompilyatsiya qiling. Batafsil: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Bu ilova 16 KB sahifa hajmi bilan mos emas. ELF fayllardagi maʼlumotlarning tekislanishi tekshirilmadi. Bu ilova sahifa hajmiga mos rejimda ishlaydi. Eng yaxshi moslik uchun ilovani 16 KB sahifa hajmi bilan qayta kompilyatsiya qiling. Batafsil: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Bu ilova 16 KB sahifa hajmi bilan mos emas. APK va ELF fayllardagi maʼlumotlarning tekislanishi tekshirilmadi. Bu ilova sahifa hajmiga mos rejimda ishlaydi. Eng yaxshi moslik uchun ilovani 16 KB sahifa hajmi bilan qayta kompilyatsiya qiling. Batafsil: <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Xizmat ishalamaydi."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Qo‘ng‘iroq qiluvchining ID raqami sozlamasini o‘zgartirib bo‘lmaydi."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Internet <xliff:g id="CARRIERDISPLAY">%s</xliff:g> operatoriga almashtirildi"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> soatdan keyin"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> kundan keyin"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> yildan keyin"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# daqiqa oldin}other{# daqiqa oldin}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# soat oldin}other{# soat oldin}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# kun oldin}other{# kun oldin}}"</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 9dc1a30455a8..f42e46ffb6cc 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"Số gọi đến mặc định thành bị giới hạn. Cuộc gọi tiếp theo. Không bị giới hạn"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"Số gọi đến mặc định thành không bị giới hạn. Cuộc gọi tiếp theo. Bị giới hạn"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"Số gọi đến mặc định thành không bị giới hạn. Cuộc gọi tiếp theo. Không bị giới hạn"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Ứng dụng này không tương thích với kích thước trang 16 KB. Không kiểm tra được sự tương thích của tệp APK. Ứng dụng này sẽ chạy ở chế độ tương thích với kích thước trang. Để đảm bảo khả năng tương thích tốt nhất, vui lòng biên dịch lại ứng dụng ở chế độ hỗ trợ kích thước trang 16 KB. Để biết thêm thông tin, hãy xem <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Ứng dụng này không tương thích với kích thước trang 16 KB. Không kiểm tra được sự tương thích của tệp ELF. Ứng dụng này sẽ chạy ở chế độ tương thích với kích thước trang. Để đảm bảo khả năng tương thích tốt nhất, vui lòng biên dịch lại ứng dụng ở chế độ hỗ trợ kích thước trang 16 KB. Để biết thêm thông tin, hãy xem <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Ứng dụng này không tương thích với kích thước trang 16 KB. Không kiểm tra được sự tương thích của tệp APK và tệp ELF. Ứng dụng này sẽ chạy ở chế độ tương thích với kích thước trang. Để đảm bảo khả năng tương thích tốt nhất, vui lòng biên dịch lại ứng dụng ở chế độ hỗ trợ kích thước trang 16 KB. Để biết thêm thông tin, hãy xem <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Dịch vụ không được cấp phép."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Bạn không thể thay đổi cài đặt ID người gọi."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Đã chuyển dữ liệu sang <xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> giờ nữa"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> ngày nữa"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> năm nữa"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# phút trước}other{# phút trước}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# giờ trước}other{# giờ trước}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# ngày trước}other{# ngày trước}}"</string> diff --git a/core/res/res/values-w192dp/dimens_material.xml b/core/res/res/values-w192dp/dimens_material.xml index a11eb7f96f45..797bf5a4c717 100644 --- a/core/res/res/values-w192dp/dimens_material.xml +++ b/core/res/res/values-w192dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">7.99dp</dimen> <dimen name="screen_percentage_05">9.6dp</dimen> - <dimen name="screen_percentage_052">9.98dp</dimen> <dimen name="screen_percentage_10">19.2dp</dimen> - <dimen name="screen_percentage_12">23.04dp</dimen> <dimen name="screen_percentage_15">28.8dp</dimen> - <dimen name="screen_percentage_3646">69.99dp</dimen> </resources> diff --git a/core/res/res/values-w195dp/dimens_material.xml b/core/res/res/values-w195dp/dimens_material.xml index 346066f27349..7f3ad29f5505 100644 --- a/core/res/res/values-w195dp/dimens_material.xml +++ b/core/res/res/values-w195dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">8.11dp</dimen> <dimen name="screen_percentage_05">9.75dp</dimen> - <dimen name="screen_percentage_052">10.14dp</dimen> <dimen name="screen_percentage_10">19.5dp</dimen> - <dimen name="screen_percentage_12">23.4dp</dimen> <dimen name="screen_percentage_15">29.25dp</dimen> - <dimen name="screen_percentage_3646">71.09dp</dimen> </resources> diff --git a/core/res/res/values-w198dp/dimens_material.xml b/core/res/res/values-w198dp/dimens_material.xml index 4c88f0520a71..a8aed2541c57 100644 --- a/core/res/res/values-w198dp/dimens_material.xml +++ b/core/res/res/values-w198dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">8.24dp</dimen> <dimen name="screen_percentage_05">9.9dp</dimen> - <dimen name="screen_percentage_052">10.3dp</dimen> <dimen name="screen_percentage_10">19.8dp</dimen> - <dimen name="screen_percentage_12">23.76dp</dimen> <dimen name="screen_percentage_15">29.7dp</dimen> - <dimen name="screen_percentage_3646">72.1dp</dimen> </resources> diff --git a/core/res/res/values-w204dp-round-watch/dimens_material.xml b/core/res/res/values-w204dp-round-watch/dimens_material.xml index 54bb0c9c292e..c07d5c47e2e1 100644 --- a/core/res/res/values-w204dp-round-watch/dimens_material.xml +++ b/core/res/res/values-w204dp-round-watch/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">8.48dp</dimen> <dimen name="screen_percentage_05">10.2dp</dimen> - <dimen name="screen_percentage_052">10.61dp</dimen> <dimen name="screen_percentage_10">20.4dp</dimen> - <dimen name="screen_percentage_12">24.48dp</dimen> <dimen name="screen_percentage_15">30.6dp</dimen> - <dimen name="screen_percentage_3646">74.42dp</dimen> </resources> diff --git a/core/res/res/values-w205dp/dimens_material.xml b/core/res/res/values-w205dp/dimens_material.xml index 60f65bb5863a..94907ee51dcc 100644 --- a/core/res/res/values-w205dp/dimens_material.xml +++ b/core/res/res/values-w205dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">8.52dp</dimen> <dimen name="screen_percentage_05">10.25dp</dimen> - <dimen name="screen_percentage_052">10.66dp</dimen> <dimen name="screen_percentage_10">20.5dp</dimen> - <dimen name="screen_percentage_12">24.6dp</dimen> <dimen name="screen_percentage_15">30.75dp</dimen> - <dimen name="screen_percentage_3646">74.78dp</dimen> </resources> diff --git a/core/res/res/values-w208dp/dimens_material.xml b/core/res/res/values-w208dp/dimens_material.xml index 7f4ccd9d15cb..069eeb0ad753 100644 --- a/core/res/res/values-w208dp/dimens_material.xml +++ b/core/res/res/values-w208dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">8.65dp</dimen> <dimen name="screen_percentage_05">10.4dp</dimen> - <dimen name="screen_percentage_052">10.82dp</dimen> <dimen name="screen_percentage_10">20.8dp</dimen> - <dimen name="screen_percentage_12">24.96dp</dimen> <dimen name="screen_percentage_15">31.2dp</dimen> - <dimen name="screen_percentage_3646">75.65dp</dimen> </resources> diff --git a/core/res/res/values-w210dp-round-watch/dimens_material.xml b/core/res/res/values-w210dp-round-watch/dimens_material.xml index ca0889e2c73b..79acf84b7e3f 100644 --- a/core/res/res/values-w210dp-round-watch/dimens_material.xml +++ b/core/res/res/values-w210dp-round-watch/dimens_material.xml @@ -14,14 +14,6 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">8.73dp</dimen> - <dimen name="screen_percentage_05">10.5dp</dimen> - <dimen name="screen_percentage_052">10.92dp</dimen> - <dimen name="screen_percentage_10">21dp</dimen> - <dimen name="screen_percentage_12">25.2dp</dimen> - <dimen name="screen_percentage_15">31.5dp</dimen> - <dimen name="screen_percentage_3646">76.57dp</dimen> - <dimen name="text_size_display_4_material">80sp</dimen> <dimen name="text_size_display_3_material">50sp</dimen> <dimen name="text_size_display_2_material">40sp</dimen> diff --git a/core/res/res/values-w211dp/dimens_material.xml b/core/res/res/values-w211dp/dimens_material.xml index c483e455c5c3..bd7ca9aa9164 100644 --- a/core/res/res/values-w211dp/dimens_material.xml +++ b/core/res/res/values-w211dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">8.77dp</dimen> <dimen name="screen_percentage_05">10.55dp</dimen> - <dimen name="screen_percentage_052">10.97dp</dimen> <dimen name="screen_percentage_10">21.1dp</dimen> - <dimen name="screen_percentage_12">25.32dp</dimen> <dimen name="screen_percentage_15">31.65dp</dimen> - <dimen name="screen_percentage_3646">76.93dp</dimen> </resources> diff --git a/core/res/res/values-w213dp/dimens_material.xml b/core/res/res/values-w213dp/dimens_material.xml index 093c298e1ac9..8a4e3a08ea13 100644 --- a/core/res/res/values-w213dp/dimens_material.xml +++ b/core/res/res/values-w213dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">8.85dp</dimen> <dimen name="screen_percentage_05">10.65dp</dimen> - <dimen name="screen_percentage_052">11.07dp</dimen> <dimen name="screen_percentage_10">21.3dp</dimen> - <dimen name="screen_percentage_12">25.56dp</dimen> <dimen name="screen_percentage_15">31.95dp</dimen> - <dimen name="screen_percentage_3646">77.66dp</dimen> </resources> diff --git a/core/res/res/values-w216dp/dimens_material.xml b/core/res/res/values-w216dp/dimens_material.xml deleted file mode 100644 index 71dbf727480e..000000000000 --- a/core/res/res/values-w216dp/dimens_material.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2024 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<resources> - <dimen name="screen_percentage_0416">8.99dp</dimen> - <dimen name="screen_percentage_05">10.8dp</dimen> - <dimen name="screen_percentage_052">11.23dp</dimen> - <dimen name="screen_percentage_10">21.6dp</dimen> - <dimen name="screen_percentage_12">25.92dp</dimen> - <dimen name="screen_percentage_15">32.4dp</dimen> - <dimen name="screen_percentage_3646">78.77dp</dimen> -</resources> diff --git a/core/res/res/values-w225dp/dimens_material.xml b/core/res/res/values-w225dp/dimens_material.xml index 6df34a5bb0ea..aa822a32c975 100644 --- a/core/res/res/values-w225dp/dimens_material.xml +++ b/core/res/res/values-w225dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">9.36dp</dimen> <dimen name="screen_percentage_05">11.25dp</dimen> - <dimen name="screen_percentage_052">11.7dp</dimen> <dimen name="screen_percentage_10">22.5dp</dimen> - <dimen name="screen_percentage_12">27dp</dimen> <dimen name="screen_percentage_15">33.75dp</dimen> - <dimen name="screen_percentage_3646">82.46dp</dimen> </resources> diff --git a/core/res/res/values-w227dp/dimens_material.xml b/core/res/res/values-w227dp/dimens_material.xml index bbf4924ccc23..eb4df8a225d6 100644 --- a/core/res/res/values-w227dp/dimens_material.xml +++ b/core/res/res/values-w227dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">9.44dp</dimen> <dimen name="screen_percentage_05">11.35dp</dimen> - <dimen name="screen_percentage_052">11.8dp</dimen> <dimen name="screen_percentage_10">22.7dp</dimen> - <dimen name="screen_percentage_12">27.24dp</dimen> <dimen name="screen_percentage_15">34.05dp</dimen> - <dimen name="screen_percentage_3646">83.19dp</dimen> </resources> diff --git a/core/res/res/values-w228dp/dimens_material.xml b/core/res/res/values-w228dp/dimens_material.xml index 24bbb4c219ba..a2009754d95b 100644 --- a/core/res/res/values-w228dp/dimens_material.xml +++ b/core/res/res/values-w228dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">9.48dp</dimen> <dimen name="screen_percentage_05">11.4dp</dimen> - <dimen name="screen_percentage_052">11.86dp</dimen> <dimen name="screen_percentage_10">22.8dp</dimen> - <dimen name="screen_percentage_12">27.36dp</dimen> <dimen name="screen_percentage_15">34.2dp</dimen> - <dimen name="screen_percentage_3646">83.55dp</dimen> </resources> diff --git a/core/res/res/values-w240dp/dimens_material.xml b/core/res/res/values-w240dp/dimens_material.xml index bd26c8bf84df..a4b58fa95c50 100644 --- a/core/res/res/values-w240dp/dimens_material.xml +++ b/core/res/res/values-w240dp/dimens_material.xml @@ -14,11 +14,7 @@ limitations under the License. --> <resources> - <dimen name="screen_percentage_0416">9.98dp</dimen> <dimen name="screen_percentage_05">12dp</dimen> - <dimen name="screen_percentage_052">12.48dp</dimen> <dimen name="screen_percentage_10">24dp</dimen> - <dimen name="screen_percentage_12">28.8dp</dimen> <dimen name="screen_percentage_15">36dp</dimen> - <dimen name="screen_percentage_3646">87.5dp</dimen> </resources> diff --git a/core/res/res/values-watch-v36/dimens_material.xml b/core/res/res/values-watch-v36/dimens_material.xml index c80884439d69..7232786d92c9 100644 --- a/core/res/res/values-watch-v36/dimens_material.xml +++ b/core/res/res/values-watch-v36/dimens_material.xml @@ -22,26 +22,11 @@ <dimen name="btn_lineHeight">18sp</dimen> <dimen name="btn_textSize">15sp</dimen> - <!-- values for material3 AlertDialog Title --> - <dimen name="alertDialog_material_line_height_title">18sp</dimen> - <dimen name="alertDialog_material_text_size_title">16sp</dimen> - <item name="alertDialog_material_letter_spacing_title" format="float" type="dimen">0.0125</item> - <dimen name="alertDialog_material_side_margin_title">@dimen/screen_percentage_12</dimen> - - <!-- values for material3 AlertDialog Body --> - <dimen name="alertDialog_material_line_height_body_1">16sp</dimen> - <dimen name="alertDialog_material_text_size_body_1">14sp</dimen> - <item name="alertDialog_material_letter_spacing_body_1" format="float" type="dimen">0.0286</item> - <dimen name="alertDialog_material_side_margin_body">@dimen/screen_percentage_0416</dimen> - <!-- values for material3 AlertDialog --> <dimen name="dialog_btn_negative_width">60dp</dimen> <dimen name="dialog_btn_negative_height">60dp</dimen> <dimen name="dialog_btn_confirm_width">62dp</dimen> <dimen name="dialog_btn_confirm_height">60dp</dimen> - <dimen name="alertDialog_material_side_margin">@dimen/screen_percentage_052</dimen> - <dimen name="alertDialog_material_top_margin">@dimen/screen_percentage_10</dimen> - <dimen name="alertDialog_material_bottom_margin">@dimen/screen_percentage_3646</dimen> <!-- Opacity factor for disabled material3 widget --> <dimen name="disabled_alpha_device_default">0.12</dimen> diff --git a/core/res/res/values-watch-v36/styles_material.xml b/core/res/res/values-watch-v36/styles_material.xml index bc2daf2f67d4..6e5ef68a70c3 100644 --- a/core/res/res/values-watch-v36/styles_material.xml +++ b/core/res/res/values-watch-v36/styles_material.xml @@ -102,25 +102,4 @@ <item name="maxHeight">@dimen/progress_bar_height</item> <item name="mirrorForRtl">true</item> </style> - - <!-- TextAppearance for material3 AlertDialog Body --> - <style name="TextAppearance.AlertDialog.Body1" parent="TextAppearance.Material.Body1"> - <item name="android:fontFamily">font-family-flex-device-default</item> - <item name="android:fontVariationSettings">"'wdth' 90, 'wght' 450, 'ROND' 100, 'GRAD' 0"</item> - <item name="android:textSize">@dimen/alertDialog_material_text_size_body_1</item> - <item name="android:lineHeight">@dimen/alertDialog_material_line_height_body_1</item> - <item name="android:letterSpacing">@dimen/alertDialog_material_letter_spacing_body_1</item> - </style> - - <!-- TextAppearance for material3 AlertDialog Title --> - <style name="TextAppearance.AlertDialog.Title" parent="TextAppearance.Material.Title"> - <item name="android:fontFamily">font-family-flex-device-default</item> - <item name="android:fontVariationSettings">"'wdth' 100, 'wght' 550, 'ROND' 100, 'GRAD' 0"</item> - <item name="android:textSize">@dimen/alertDialog_material_text_size_title</item> - <item name="android:lineHeight">@dimen/alertDialog_material_line_height_title</item> - <item name="android:letterSpacing">@dimen/alertDialog_material_letter_spacing_title</item> - <item name="android:maxLines">2</item> - <item name="android:shadowRadius">0</item> - <item name="android:ellipsize">end</item> - </style> </resources>
\ No newline at end of file diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 98f1898b7fbd..14e85574f413 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"默认不显示本机号码，但在下一次通话中显示"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"默认显示本机号码，但在下一次通话中不显示"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"默认显示本机号码，在下一次通话中也显示"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"此应用不兼容 16 KB。APK 对齐检查失败。此应用将使用页面大小兼容模式运行。为获得最佳兼容性，请将此应用重新编译为支持 16 KB。如需了解详情，请参阅 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"此应用不兼容 16 KB。ELF 对齐检查失败。此应用将使用页面大小兼容模式运行。为获得最佳兼容性，请将此应用重新编译为支持 16 KB。如需了解详情，请参阅 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"此应用不兼容 16 KB。APK 和 ELF 对齐检查失败。此应用将使用页面大小兼容模式运行。为获得最佳兼容性，请将此应用重新编译为支持 16 KB。如需了解详情，请参阅 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"未提供服务。"</string> <string name="CLIRPermanent" msgid="166443681876381118">"您无法更改来电显示设置。"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"移动数据网络已切换至“<xliff:g id="CARRIERDISPLAY">%s</xliff:g>”"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g>小时后"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g>天后"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g>年后"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# 分钟前}other{# 分钟前}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# 小时前}other{# 小时前}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# 天前}other{# 天前}}"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index a544b44d0da3..c4079e00605b 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"預設不顯示來電號碼，但下一通電話則顯示。"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"預設顯示來電號碼，但下一通電話不顯示。"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"預設顯示來電號碼，下一通電話也繼續顯示。"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"此應用程式不兼容 16KB。未能通過 APK 一致性檢查。此應用程式將使用頁面大小兼容模式運行。為達至最佳的兼容性，請將應用程式重新編譯為支援 16KB。詳情請瀏覽 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"此應用程式不兼容 16KB。未能通過電子商務記錄格式一致性檢查。此應用程式將使用頁面大小兼容模式運行。為達至最佳的兼容性，請將應用程式重新編譯為支援 16KB。詳情請瀏覽 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"此應用程式不兼容 16KB。未能通過 APK 和電子商務記錄格式一致性檢查。此應用程式將使用頁面大小兼容模式運行。為達至最佳的兼容性，請將應用程式重新編譯為支援 16KB。詳情請瀏覽 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"未提供此服務。"</string> <string name="CLIRPermanent" msgid="166443681876381118">"你無法更改來電顯示設定。"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"流動數據已切換至「<xliff:g id="CARRIERDISPLAY">%s</xliff:g>」"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> 小時後"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> 天後"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> 年後"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# 分鐘前}other{# 分鐘前}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# 小時前}other{# 小時前}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# 天前}other{# 天前}}"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 68158cea4559..3c3a0ef23b84 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"預設不顯示本機號碼，但下一通電話顯示。"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"預設顯示本機號碼，但下一通電話不顯示。"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"預設顯示本機號碼，下一通電話也繼續顯示。"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"這個應用程式不支援 16 KB，APK 校驗檢查失敗。這個應用程式將以頁面大小相容性模式執行。為獲得最佳相容性，請重新編譯，讓應用程式支援 16 KB。詳情請參閱 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"這個應用程式不支援 16 KB，ELF 校驗檢查失敗。這個應用程式將以頁面大小相容性模式執行。為獲得最佳相容性，請重新編譯，讓應用程式支援 16 KB。詳情請參閱 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"這個應用程式不支援 16 KB，APK 和 ELF 校驗檢查失敗。這個應用程式將以頁面大小相容性模式執行。為獲得最佳相容性，請重新編譯，讓應用程式支援 16 KB。詳情請參閱 <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"無法提供此服務。"</string> <string name="CLIRPermanent" msgid="166443681876381118">"你無法變更來電顯示設定。"</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"行動數據已切換至「<xliff:g id="CARRIERDISPLAY">%s</xliff:g>」"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"<xliff:g id="COUNT">%d</xliff:g> 小時後"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"<xliff:g id="COUNT">%d</xliff:g> 天後"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"<xliff:g id="COUNT">%d</xliff:g> 年後"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{# 分鐘前}other{# 分鐘前}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{# 小時前}other{# 小時前}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{# 天前}other{# 天前}}"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 9047a986c21c..dc72cb7b9760 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -71,12 +71,9 @@ <string name="CLIRDefaultOnNextCallOff" msgid="5036749051007098105">"i-ID yomshayeli ishintshela kokuvinjiwe. Ucingo olulandelayo: Aluvinjelwe"</string> <string name="CLIRDefaultOffNextCallOn" msgid="1022781126694885017">"I-ID Yomshayeli ishintshela kokungavinjelwe. Ucingo olulandelayo: Luvinjelwe"</string> <string name="CLIRDefaultOffNextCallOff" msgid="2491576172356463443">"I-ID Yomshayeli ishintshela kokungavinjelwe. Ucingo olulandelayo: Aluvinjelwe"</string> - <!-- no translation found for page_size_compat_apk_warning (2982396798449041224) --> - <skip /> - <!-- no translation found for page_size_compat_elf_warning (6753874059564812651) --> - <skip /> - <!-- no translation found for page_size_compat_apk_and_elf_warning (7628675779500605390) --> - <skip /> + <string name="page_size_compat_apk_warning" msgid="2982396798449041224">"Le app ayihambelani ne-16 KB. Ukuhlolwa kokuqondanisa i-APK kuhlulekile. Le app izoqaliswa kusetshenziswa imodi yokuhambelana kobukhulu bekhasi. Ukuze kube nokuhambelana okuhle kakhulu, sicela uhlanganise kabusha i-app ngosekelo lwe-16 KB. Ukuze uthole imininingwane eyengeziwe, bheka <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_elf_warning" msgid="6753874059564812651">"Le app ayihambelani ne-16 KB. Ukuhlolwa kokuqondanisa i-ELF kuhlulekile. Le app izoqaliswa kusetshenziswa imodi yokuhambelana kobukhulu bekhasi. Ukuze kube nokuhambelana okuhle kakhulu, sicela uhlanganise kabusha i-app ngosekelo lwe-16 KB. Ukuze uthole imininingwane eyengeziwe, bheka <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> + <string name="page_size_compat_apk_and_elf_warning" msgid="7628675779500605390">"Le app ayihambelani ne-16 KB. Ukuhlola ukuqondanisa i-APK ne-ELF kuhlulekile. Le app izoqaliswa kusetshenziswa imodi yokuhambelana kobukhulu bekhasi. Ukuze kube nokuhambelana okuhle kakhulu, sicela uhlanganise kabusha i-app ngosekelo lwe-16 KB. Ukuze uthole imininingwane eyengeziwe, bheka <a href=\"https://developer.android.com/16kb-page-size\">https://developer.android.com/16kb-page-size</a>"</string> <string name="serviceNotProvisioned" msgid="8289333510236766193">"Isevisi ayilungiselelwe."</string> <string name="CLIRPermanent" msgid="166443681876381118">"Ngeke ukwazi ukuguqul izilungiselelo zemininingwane yoshayayo."</string> <string name="auto_data_switch_title" msgid="3286350716870518297">"Ushintshele idatha ku-<xliff:g id="CARRIERDISPLAY">%s</xliff:g>"</string> @@ -1161,6 +1158,38 @@ <string name="duration_hours_shortest_future" msgid="2979276794547981674">"ngehora elingu-<xliff:g id="COUNT">%d</xliff:g>"</string> <string name="duration_days_shortest_future" msgid="3392722163935571543">"ngosuku olu-<xliff:g id="COUNT">%d</xliff:g>"</string> <string name="duration_years_shortest_future" msgid="5537464088352970388">"ngonyaka ongu-<xliff:g id="COUNT">%d</xliff:g>"</string> + <!-- no translation found for duration_minutes_shortest_past (1740022450020492407) --> + <skip /> + <!-- no translation found for duration_hours_shortest_past (2098397414186628489) --> + <skip /> + <!-- no translation found for duration_days_shortest_past (1832006037955897625) --> + <skip /> + <!-- no translation found for duration_years_shortest_past (6168256514200469291) --> + <skip /> + <!-- no translation found for duration_minutes_medium (5891933490342643944) --> + <skip /> + <!-- no translation found for duration_hours_medium (1465359726485910115) --> + <skip /> + <!-- no translation found for duration_days_medium (5994225628248661388) --> + <skip /> + <!-- no translation found for duration_years_medium (734023884353592526) --> + <skip /> + <!-- no translation found for duration_minutes_medium_future (2750894988731934402) --> + <skip /> + <!-- no translation found for duration_hours_medium_future (6050833881463849764) --> + <skip /> + <!-- no translation found for duration_days_medium_future (1700821545602729963) --> + <skip /> + <!-- no translation found for duration_years_medium_future (3281018940397120166) --> + <skip /> + <!-- no translation found for duration_minutes_medium_past (7400424340181947714) --> + <skip /> + <!-- no translation found for duration_hours_medium_past (6709441336035202617) --> + <skip /> + <!-- no translation found for duration_days_medium_past (5748156261134344532) --> + <skip /> + <!-- no translation found for duration_years_medium_past (893797065424596243) --> + <skip /> <string name="duration_minutes_relative" msgid="8620337701051015593">"{count,plural, =1{umzuzu odlule #}one{imizuzu edlule #}other{imizuzu edlule #}}"</string> <string name="duration_hours_relative" msgid="4836449961693180253">"{count,plural, =1{ihora elingu-# eledlule}one{amahora adlule angu-#}other{amahora adlule angu-#}}"</string> <string name="duration_days_relative" msgid="621965767567258302">"{count,plural, =1{usuku oludlule #}one{izinsuku ezedlule #}other{izinsuku ezedlule #}}"</string> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 8c46ccc84f39..238aca556003 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -10570,6 +10570,32 @@ <declare-styleable name="DateTimeView"> <attr name="showRelative" format="boolean" /> + <!-- For relative times, controls what kinds of times get disambiguation text. + + The default value is "future". + + Does nothing if showRelative=false. + --> + <attr name="relativeTimeDisambiguationText"> + <!-- Times in the past will have extra clarifying text indicating that the time is in + the past. For example, 1 minute ago is represented as "1m ago". If this flag is not + set, times in the past are represented as just "1m". --> + <flag name="past" value="0x01" /> + <!-- Times in the future will have extra clarifying text indicating that the time is in + the future. For example, 1 minute in the future is represented as "in 1m". If this + flag is not set, times in the future are represented as just "1m". --> + <flag name="future" value="0x02" /> + </attr> + <!-- For relative times, sets the length of the time unit displayed (minutes, hours, etc.). + + Does nothing if showRelative=false. + --> + <attr name="relativeTimeUnitDisplayLength"> + <!-- The time unit will be shown as a short as possible (1 character if possible). --> + <enum name="shortest" value="0" /> + <!-- The time unit will be shortened to a medium length (2-3 characters in general). --> + <enum name="medium" value="1" /> + </attr> </declare-styleable> <declare-styleable name="ResolverDrawerLayout_LayoutParams"> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f199159039d6..13c125cb7349 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -815,6 +815,11 @@ we rely on gravity to determine the effective orientation. --> <bool name="config_deskDockEnablesAccelerometer">true</bool> + <!-- Control for allowing the dock rotation functionality before provision like + when the SetupWizard is being shown to the user. This defaults to false to + preserve existing behavior. --> + <bool name="config_allowDockBeforeProvision">false</bool> + <!-- Car dock behavior --> <!-- The number of degrees to rotate the display when the device is in a car dock. @@ -2367,7 +2372,7 @@ <string name="default_sms_application" translatable="false">com.android.messaging</string> <!-- Flag indicating whether the current device supports "Ask every time" for sms--> - <bool name="config_sms_ask_every_time_support">true</bool> + <bool name="config_sms_ask_every_time_support">false</bool> <!-- Flag indicating whether the current device allows acknowledgement of SIM operation like SM-PP or saving SMS to SIM can be done via the IMS interfaces. @@ -7267,4 +7272,13 @@ POLICY_DOZE can also dim the screen unless parameter useNormalBrightnessForDoze of DreamService#setDozeScreenState requests an exception. --> <bool name="config_allowNormalBrightnessForDozePolicy">false</bool> + + <!-- List of protected packages that require biometric authentication for modification + (Disable, force-stop or uninstalling updates). --> + <string-array name="config_biometric_protected_package_names" translatable="false" /> + + <!-- Package name of the on-device intelligent processor for vendor specific + features. Examples include the search functionality or the app + predictor. --> + <string name="config_systemVendorIntelligence" translatable="false"></string> </resources> diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index 90f1b8a7046b..7b9d21364aca 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -154,6 +154,9 @@ <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_PLATFORM_API_ENABLED) @hide @SystemApi --> <public name="config_defaultReservedForTestingProfileGroupExclusivity" /> + <!-- @FlaggedApi(android.permission.flags.Flags.FLAG_SYSTEM_VENDOR_INTELLIGENCE_ROLE_ENABLED) + @hide @SystemApi --> + <public name="config_systemVendorIntelligence" /> </staging-public-group> <staging-public-group type="dimen" first-id="0x01b30000"> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index d498b9191559..cfc3ddca27eb 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3135,6 +3135,86 @@ in <xliff:g id="count">%d</xliff:g>y </string> + <!-- Phrase describing a time duration using minutes that is as short as possible, preferrably one character. This version should be a past point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=14] --> + <string name="duration_minutes_shortest_past"> + <xliff:g id="count">%d</xliff:g>m ago + </string> + + <!-- Phrase describing a time duration using hours that is as short as possible, preferrably one character. This version should be a past point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=14] --> + <string name="duration_hours_shortest_past"> + <xliff:g id="count">%d</xliff:g>h ago + </string> + + <!-- Phrase describing a time duration using days that is as short as possible, preferrably one character. This version should be a past point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=14] --> + <string name="duration_days_shortest_past"> + <xliff:g example="1" id="count">%d</xliff:g>d ago + </string> + + <!-- Phrase describing a time duration using years that is as short as possible, preferrably one character. This version should be a past point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=14] --> + <string name="duration_years_shortest_past"> + <xliff:g id="count">%d</xliff:g>y ago + </string> + + <!-- Phrase describing a time duration using minutes that is a medium length, preferrably two or three characters. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=8] --> + <string name="duration_minutes_medium"> + <xliff:g id="count">%d</xliff:g>min + </string> + + <!-- Phrase describing a time duration using hours that is a medium length, preferrably two or three characters. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=8] --> + <string name="duration_hours_medium"> + <xliff:g id="count">%d</xliff:g>hr + </string> + + <!-- Phrase describing a time duration using days that is a medium length, preferrably two or three characters. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=8] --> + <string name="duration_days_medium"> + <xliff:g id="count">%d</xliff:g>d + </string> + + <!-- Phrase describing a time duration using years that is a medium length, preferrably two or three characters. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=8] --> + <string name="duration_years_medium"> + <xliff:g id="count">%d</xliff:g>yr + </string> + + <!-- Phrase describing a time duration using minutes that is a medium length, preferrably two or three characters. This version should be a future point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=18] --> + <string name="duration_minutes_medium_future"> + in <xliff:g id="count">%d</xliff:g>min + </string> + + <!-- Phrase describing a time duration using hours that is a medium length, preferrably two or three characters. This version should be a future point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=18] --> + <string name="duration_hours_medium_future"> + in <xliff:g id="count">%d</xliff:g>hr + </string> + + <!-- Phrase describing a time duration using days that is a medium length, preferrably two or three characters. This version should be a future point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=18] --> + <string name="duration_days_medium_future"> + in <xliff:g example="1" id="count">%d</xliff:g>d + </string> + + <!-- Phrase describing a time duration using years that is a medium length, preferrably two or three characters. This version should be a future point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=18] --> + <string name="duration_years_medium_future"> + in <xliff:g id="count">%d</xliff:g>yr + </string> + + <!-- Phrase describing a time duration using minutes that is a medium length, preferrably two or three characters. This version should be a past point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=18] --> + <string name="duration_minutes_medium_past"> + <xliff:g id="count">%d</xliff:g>min ago + </string> + + <!-- Phrase describing a time duration using hours that is a medium length, preferrably two or three characters. This version should be a past point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=18] --> + <string name="duration_hours_medium_past"> + <xliff:g id="count">%d</xliff:g>hr ago + </string> + + <!-- Phrase describing a time duration using days that is a medium length, preferrably two or three characters. This version should be a past point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=18] --> + <string name="duration_days_medium_past"> + <xliff:g example="1" id="count">%d</xliff:g>d ago + </string> + + <!-- Phrase describing a time duration using years that is a medium length, preferrably two or three characters. This version should be a past point in time. If the language needs a space in between the integer and the unit, please also integrate it in the string, but preferably it should not have a space in between.[CHAR LIMIT=18] --> + <string name="duration_years_medium_past"> + <xliff:g id="count">%d</xliff:g>yr ago + </string> + <!-- Phrase describing a relative time using minutes in the past that is not shown on the screen but used for accessibility. [CHAR LIMIT=NONE] --> <string name="duration_minutes_relative">{count, plural, =1 {# minute ago} diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 5d6a461c5874..2671ff90b35f 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1797,6 +1797,7 @@ <java-symbol type="bool" name="config_customUserSwitchUi" /> <java-symbol type="bool" name="config_canRemoveFirstAccount" /> <java-symbol type="string" name="config_accountTypeToKeepFirstAccount" /> + <java-symbol type="bool" name="config_allowDockBeforeProvision" /> <java-symbol type="bool" name="config_deskDockEnablesAccelerometer" /> <java-symbol type="bool" name="config_disableMenuKeyInLockScreen" /> <java-symbol type="bool" name="config_enableCarDockHomeLaunch" /> @@ -3367,6 +3368,23 @@ <java-symbol type="string" name="duration_hours_shortest_future" /> <java-symbol type="string" name="duration_days_shortest_future" /> <java-symbol type="string" name="duration_years_shortest_future" /> + <java-symbol type="string" name="duration_minutes_shortest_past" /> + <java-symbol type="string" name="duration_hours_shortest_past" /> + <java-symbol type="string" name="duration_days_shortest_past" /> + <java-symbol type="string" name="duration_years_shortest_past" /> + + <java-symbol type="string" name="duration_minutes_medium" /> + <java-symbol type="string" name="duration_hours_medium" /> + <java-symbol type="string" name="duration_days_medium" /> + <java-symbol type="string" name="duration_years_medium" /> + <java-symbol type="string" name="duration_minutes_medium_future" /> + <java-symbol type="string" name="duration_hours_medium_future" /> + <java-symbol type="string" name="duration_days_medium_future" /> + <java-symbol type="string" name="duration_years_medium_future" /> + <java-symbol type="string" name="duration_minutes_medium_past" /> + <java-symbol type="string" name="duration_hours_medium_past" /> + <java-symbol type="string" name="duration_days_medium_past" /> + <java-symbol type="string" name="duration_years_medium_past" /> <java-symbol type="string" name="duration_minutes_relative" /> <java-symbol type="string" name="duration_hours_relative" /> @@ -5857,4 +5875,7 @@ <java-symbol type="dimen" name="config_motionExpressiveSlowSpatialDamping"/> <java-symbol type="dimen" name="config_motionExpressiveSlowEffectDamping"/> + <!-- List of protected packages that require biometric authentication for modification --> + <java-symbol type="array" name="config_biometric_protected_package_names" /> + </resources> diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index 49425572b256..c67a0f9659f0 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -530,14 +530,25 @@ test_module_config { } test_module_config { - name: "FrameworksCoreTests_internal_os_binder", + name: "FrameworksCoreTests_all_binder", base: "FrameworksCoreTests", test_suites: [ "automotive-tests", "device-tests", "device-platinum-tests", ], - include_filters: ["com.android.internal.os.BinderDeathDispatcherTest"], + include_filters: [ + "android.os.BinderProxyTest", + "android.os.BinderDeathRecipientTest", + "android.os.BinderFrozenStateChangeNotificationTest", + "android.os.BinderProxyCountingTest", + "android.os.BinderUncaughtExceptionHandlerTest", + "android.os.BinderThreadPriorityTest", + "android.os.BinderWorkSourceTest", + "android.os.ParcelNullabilityTest", + "android.os.ParcelTest", + "com.android.internal.os.BinderDeathDispatcherTest", + ], exclude_annotations: ["com.android.internal.os.SkipPresubmit"], } diff --git a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java index 8d045f87063b..1f1000f2800d 100644 --- a/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java +++ b/core/tests/coretests/src/android/app/activity/ActivityThreadTest.java @@ -49,6 +49,7 @@ import android.app.IApplicationThread; import android.app.PictureInPictureParams; import android.app.PictureInPictureUiState; import android.app.ResourcesManager; +import android.app.WindowConfiguration; import android.app.servertransaction.ActivityConfigurationChangeItem; import android.app.servertransaction.ActivityRelaunchItem; import android.app.servertransaction.ClientTransaction; @@ -79,6 +80,7 @@ import android.util.DisplayMetrics; import android.util.Log; import android.util.MergedConfiguration; import android.view.Display; +import android.view.Surface; import android.view.View; import android.window.ActivityWindowInfo; import android.window.WindowContextInfo; @@ -302,6 +304,59 @@ public class ActivityThreadTest { assertScreenScale(originalScale, app, originalAppConfig, originalAppMetrics); } + @Test + public void testOverrideDisplayRotation() throws Exception { + final TestActivity activity = mActivityTestRule.launchActivity(new Intent()); + final Application app = activity.getApplication(); + final ActivityThread activityThread = activity.getActivityThread(); + final IApplicationThread appThread = activityThread.getApplicationThread(); + final Configuration originalAppConfig = + new Configuration(app.getResources().getConfiguration()); + final int originalDisplayRotation = originalAppConfig.windowConfiguration + .getDisplayRotation(); + + final Configuration newConfig = new Configuration(originalAppConfig); + newConfig.seq = BASE_SEQ + 1; + + int sandboxedDisplayRotation = (originalDisplayRotation + 1) % 4; + CompatibilityInfo.setOverrideDisplayRotation(sandboxedDisplayRotation); + try { + // Send process level config change. + ClientTransaction transaction = newTransaction(activityThread); + transaction.addTransactionItem( + new ConfigurationChangeItem(newConfig, DEVICE_ID_INVALID)); + appThread.scheduleTransaction(transaction); + InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + + assertDisplayRotation(sandboxedDisplayRotation, app); + + sandboxedDisplayRotation = (sandboxedDisplayRotation + 1) % 4; + CompatibilityInfo.setOverrideDisplayRotation(sandboxedDisplayRotation); + // Send activity level config change. + newConfig.seq++; + transaction = newTransaction(activityThread); + transaction.addTransactionItem(new ActivityConfigurationChangeItem( + activity.getActivityToken(), newConfig, new ActivityWindowInfo())); + appThread.scheduleTransaction(transaction); + InstrumentationRegistry.getInstrumentation().waitForIdleSync(); + + assertDisplayRotation(sandboxedDisplayRotation, activity); + + // Execute a local relaunch item with current scaled config (e.g. simulate recreate), + // the config should not change again. + InstrumentationRegistry.getInstrumentation().runOnMainSync( + () -> activityThread.executeTransaction( + newRelaunchResumeTransaction(activity))); + + assertDisplayRotation(sandboxedDisplayRotation, activity); + } finally { + CompatibilityInfo.setOverrideDisplayRotation(WindowConfiguration.ROTATION_UNDEFINED); + InstrumentationRegistry.getInstrumentation().runOnMainSync( + () -> restoreConfig(activityThread, originalAppConfig)); + } + assertDisplayRotation(originalDisplayRotation, app); + } + private static void assertScreenScale(float scale, Context context, Configuration origConfig, DisplayMetrics origMetrics) { final int expectedDpi = (int) (origConfig.densityDpi * scale + .5f); @@ -326,6 +381,12 @@ public class ActivityThreadTest { assertEquals(expectedMaxBounds, currentConfig.windowConfiguration.getMaxBounds()); } + private static void assertDisplayRotation(@Surface.Rotation int expectedRotation, + Context context) { + final Configuration currentConfig = context.getResources().getConfiguration(); + assertEquals(expectedRotation, currentConfig.windowConfiguration.getDisplayRotation()); + } + @Test public void testHandleActivityConfigurationChanged() { final TestActivity activity = mActivityTestRule.launchActivity(new Intent()); diff --git a/core/tests/coretests/src/android/content/res/FontScaleConverterFactoryTest.kt b/core/tests/coretests/src/android/content/res/FontScaleConverterFactoryTest.kt index c0a9bc2cdd24..f9d449cd3b10 100644 --- a/core/tests/coretests/src/android/content/res/FontScaleConverterFactoryTest.kt +++ b/core/tests/coretests/src/android/content/res/FontScaleConverterFactoryTest.kt @@ -18,10 +18,7 @@ package android.content.res import android.platform.test.annotations.Presubmit import android.platform.test.annotations.RequiresFlagsEnabled -import android.platform.test.flag.junit.CheckFlagsRule import android.platform.test.flag.junit.DeviceFlagsValueProvider -import android.platform.test.flag.junit.RavenwoodFlagsValueProvider -import android.platform.test.ravenwood.RavenwoodRule import android.util.SparseArray import androidx.core.util.forEach import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -47,15 +44,7 @@ import org.junit.runner.RunWith class FontScaleConverterFactoryTest { @get:Rule - val ravenwoodRule: RavenwoodRule = RavenwoodRule.Builder().build() - - @get:Rule - val checkFlagsRule: CheckFlagsRule = - if (RavenwoodRule.isOnRavenwood()) { - RavenwoodFlagsValueProvider.createAllOnCheckFlagsRule() - } else { - DeviceFlagsValueProvider.createCheckFlagsRule() - } + val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() private var defaultLookupTables: SparseArray<FontScaleConverter>? = null diff --git a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java index be8ecbe66791..cfcd53e14c79 100644 --- a/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java +++ b/core/tests/coretests/src/android/content/res/ResourcesManagerTest.java @@ -33,8 +33,6 @@ import android.platform.test.annotations.Postsubmit; import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; -import android.platform.test.flag.junit.RavenwoodFlagsValueProvider; -import android.platform.test.ravenwood.RavenwoodRule; import android.util.ArraySet; import android.util.DisplayMetrics; import android.util.TypedValue; @@ -65,13 +63,7 @@ public class ResourcesManagerTest { private static final String TEST_LIB = "com.android.frameworks.coretests.bdr_helper_app1"; @Rule - public final RavenwoodRule mRavenwood = new RavenwoodRule.Builder().build(); - - @Rule - public final CheckFlagsRule mCheckFlagsRule = - RavenwoodRule.isOnRavenwood() - ? RavenwoodFlagsValueProvider.createAllOnCheckFlagsRule() - : DeviceFlagsValueProvider.createCheckFlagsRule(); + public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule(); private ResourcesManager mResourcesManager; private Map<Integer, DisplayMetrics> mDisplayMetricsMap; diff --git a/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java b/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java index 4172bffe100c..9a679d8e8a96 100644 --- a/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java +++ b/core/tests/coretests/src/android/os/BinderThreadPriorityTest.java @@ -31,6 +31,8 @@ import android.util.Log; import androidx.test.InstrumentationRegistry; import androidx.test.ext.junit.runners.AndroidJUnit4; +import com.android.internal.os.SkipPresubmit; + import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -131,6 +133,7 @@ public class BinderThreadPriorityTest { } @Test + @SkipPresubmit("b/381950874: bitrot and failed") public void testPassPriorityToService() throws Exception { for (int prio = 19; prio >= -20; prio--) { Process.setThreadPriority(prio); @@ -146,6 +149,7 @@ public class BinderThreadPriorityTest { } @Test + @SkipPresubmit("b/381950874: bitrot and failed") public void testCallBackFromServiceWithPriority() throws Exception { for (int prio = -20; prio <= 19; prio++) { final int expected = prio; diff --git a/core/tests/coretests/src/android/view/InsetsSourceTest.java b/core/tests/coretests/src/android/view/InsetsSourceTest.java index c3bd0657c511..108f5ba3f8a8 100644 --- a/core/tests/coretests/src/android/view/InsetsSourceTest.java +++ b/core/tests/coretests/src/android/view/InsetsSourceTest.java @@ -211,6 +211,102 @@ public class InsetsSourceTest { } @Test + public void testCalculateInsets_partialSideIntersection_leftCenter() { + mSource.setFrame(new Rect(0, 0, 100, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(0, 100, 500, 400), false); + assertEquals(Insets.of(100, 0, 0, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_leftTop() { + mSource.setFrame(new Rect(0, 0, 100, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(0, -100, 500, 400), false); + assertEquals(Insets.of(100, 0, 0, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_leftBottom() { + mSource.setFrame(new Rect(0, 0, 100, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(0, 100, 500, 600), false); + assertEquals(Insets.of(100, 0, 0, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_topCenter() { + mSource.setFrame(new Rect(0, 0, 500, 100)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(-100, 0, 600, 500), false); + assertEquals(Insets.of(0, 100, 0, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_topLeft() { + mSource.setFrame(new Rect(0, 0, 500, 100)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(-100, 0, 400, 500), false); + assertEquals(Insets.of(0, 100, 0, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_topRight() { + mSource.setFrame(new Rect(0, 0, 500, 100)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(100, 0, 600, 500), false); + assertEquals(Insets.of(0, 100, 0, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_rightCenter() { + mSource.setFrame(new Rect(400, 0, 500, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(0, 100, 500, 400), false); + assertEquals(Insets.of(0, 0, 100, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_rightTop() { + mSource.setFrame(new Rect(400, 0, 500, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(0, -100, 500, 400), false); + assertEquals(Insets.of(0, 0, 100, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_rightBottom() { + mSource.setFrame(new Rect(400, 0, 500, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(0, 100, 500, 600), false); + assertEquals(Insets.of(0, 0, 100, 0), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_bottomCenter() { + mSource.setFrame(new Rect(0, 400, 500, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(-100, 0, 600, 500), false); + assertEquals(Insets.of(0, 0, 0, 100), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_bottomLeft() { + mSource.setFrame(new Rect(0, 400, 500, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(-100, 0, 400, 500), false); + assertEquals(Insets.of(0, 0, 0, 100), insets); + } + + @Test + public void testCalculateInsets_partialSideIntersection_bottomRight() { + mSource.setFrame(new Rect(0, 400, 500, 500)); + mSource.updateSideHint(new Rect(0, 0, 500, 500)); + Insets insets = mSource.calculateInsets(new Rect(100, 0, 600, 500), false); + assertEquals(Insets.of(0, 0, 0, 100), insets); + } + + @Test public void testCalculateVisibleInsets_override() { mSource.setFrame(new Rect(0, 0, 500, 100)); mSource.setVisibleFrame(new Rect(0, 0, 500, 200)); diff --git a/core/tests/coretests/src/android/widget/DateTimeViewTest.java b/core/tests/coretests/src/android/widget/DateTimeViewTest.java index a8fd913d857f..be65277a020e 100644 --- a/core/tests/coretests/src/android/widget/DateTimeViewTest.java +++ b/core/tests/coretests/src/android/widget/DateTimeViewTest.java @@ -69,6 +69,141 @@ public class DateTimeViewTest { Assert.assertFalse(dateTimeView.wasLayoutRequested()); } + @UiThreadTest + @Test + public void disambiguationTextMask_none_noPastOrFutureDisambiguationText() { + final TestDateTimeView dateTimeView = new TestDateTimeView(); + dateTimeView.setShowRelativeTime(true); + dateTimeView.setRelativeTimeDisambiguationTextMask(0); + + // Minutes + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofMinutes(8).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("in")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofMinutes(8).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("ago")); + + // Hours + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofHours(4).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("in")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofHours(4).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("ago")); + + // Days + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofDays(14).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("in")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofDays(14).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("ago")); + + // Years + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofDays(400).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("in")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofDays(400).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("ago")); + } + + @UiThreadTest + @Test + public void disambiguationTextMask_bothPastAndFuture_usesPastAndFutureDisambiguationText() { + final TestDateTimeView dateTimeView = new TestDateTimeView(); + dateTimeView.setShowRelativeTime(true); + dateTimeView.setRelativeTimeDisambiguationTextMask( + DateTimeView.DISAMBIGUATION_TEXT_PAST | DateTimeView.DISAMBIGUATION_TEXT_FUTURE); + + // Minutes + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofMinutes(8).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("in")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofMinutes(8).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("ago")); + + // Hours + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofHours(4).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("in")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofHours(4).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("ago")); + + // Days + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofDays(14).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("in")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofDays(14).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("ago")); + + // Years + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofDays(400).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("in")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofDays(400).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("ago")); + } + + @UiThreadTest + @Test + public void unitDisplayLength_shortest_noMediumText() { + final TestDateTimeView dateTimeView = new TestDateTimeView(); + dateTimeView.setShowRelativeTime(true); + dateTimeView.setRelativeTimeUnitDisplayLength(DateTimeView.UNIT_DISPLAY_LENGTH_SHORTEST); + + // Minutes + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofMinutes(8).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("min")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofMinutes(8).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("min")); + + // Hours + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofHours(4).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("hr")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofHours(4).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("hr")); + + // Days excluded because the string is the same for both shortest length and medium length + + // Years + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofDays(400).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("yr")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofDays(400).toMillis()); + Assert.assertFalse(dateTimeView.getText().toString().contains("yr")); + } + + @UiThreadTest + @Test + public void unitDisplayLength_medium_usesMediumText() { + final TestDateTimeView dateTimeView = new TestDateTimeView(); + dateTimeView.setShowRelativeTime(true); + dateTimeView.setRelativeTimeUnitDisplayLength(DateTimeView.UNIT_DISPLAY_LENGTH_MEDIUM); + + // Minutes + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofMinutes(8).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("min")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofMinutes(8).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("min")); + + // Hours + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofHours(4).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("hr")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofHours(4).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("hr")); + + // Days excluded because the string is the same for both shortest length and medium length + + // Years + dateTimeView.setTime(System.currentTimeMillis() + Duration.ofDays(400).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("yr")); + + dateTimeView.setTime(System.currentTimeMillis() - Duration.ofDays(400).toMillis()); + Assert.assertTrue(dateTimeView.getText().toString().contains("yr")); + } + private static class TestDateTimeView extends DateTimeView { private boolean mRequestedLayout = false; diff --git a/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java b/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java index a6466c58dfda..74b4de1833ea 100644 --- a/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java @@ -63,8 +63,6 @@ import android.os.Build; import android.os.Handler; import android.os.Message; import android.os.Vibrator; -import android.platform.test.annotations.EnableFlags; -import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.speech.tts.TextToSpeech; import android.speech.tts.Voice; @@ -73,7 +71,6 @@ import android.view.Display; import android.view.Window; import android.view.WindowManager; import android.view.accessibility.AccessibilityManager; -import android.view.accessibility.Flags; import android.view.accessibility.IAccessibilityManager; import android.widget.Toast; @@ -86,7 +83,6 @@ import com.android.internal.util.test.FakeSettingsProvider; import org.junit.AfterClass; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -104,8 +100,6 @@ import java.util.Set; @RunWith(AndroidJUnit4.class) public class AccessibilityShortcutControllerTest { - @Rule - public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); private static final String SERVICE_NAME_STRING = "fake.package/fake.service.name"; private static final CharSequence PACKAGE_NAME_STRING = "Service name"; private static final String SERVICE_NAME_SUMMARY = "Summary"; @@ -535,7 +529,6 @@ public class AccessibilityShortcutControllerTest { } @Test - @EnableFlags(Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE) public void testOnAccessibilityShortcut_settingNull_dialogShown_enablesDefaultShortcut() throws Exception { configureDefaultAccessibilityService(); diff --git a/core/tests/coretests/src/com/android/internal/accessibility/dialog/AccessibilityServiceWarningTest.java b/core/tests/coretests/src/com/android/internal/accessibility/dialog/AccessibilityServiceWarningTest.java index 8e906fda89f0..478cef86cdba 100644 --- a/core/tests/coretests/src/com/android/internal/accessibility/dialog/AccessibilityServiceWarningTest.java +++ b/core/tests/coretests/src/com/android/internal/accessibility/dialog/AccessibilityServiceWarningTest.java @@ -25,8 +25,6 @@ import android.accessibilityservice.AccessibilityServiceInfo; import android.app.AlertDialog; import android.content.Context; import android.os.RemoteException; -import android.platform.test.annotations.RequiresFlagsDisabled; -import android.platform.test.annotations.RequiresFlagsEnabled; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.testing.AndroidTestingRunner; @@ -35,7 +33,6 @@ import android.view.InputDevice; import android.view.MotionEvent; import android.view.View; import android.view.Window; -import android.view.accessibility.Flags; import android.widget.TextView; import androidx.test.platform.app.InstrumentationRegistry; @@ -92,19 +89,7 @@ public class AccessibilityServiceWarningTest { } @Test - @RequiresFlagsDisabled(Flags.FLAG_WARNING_USE_DEFAULT_DIALOG_TYPE) - public void createAccessibilityServiceWarningDialog_hasExpectedWindowParams_isSystemDialog() { - createAccessibilityServiceWarningDialog_hasExpectedWindowParams(true); - } - - @Test - @RequiresFlagsEnabled(Flags.FLAG_WARNING_USE_DEFAULT_DIALOG_TYPE) public void createAccessibilityServiceWarningDialog_hasExpectedWindowParams_notSystemDialog() { - createAccessibilityServiceWarningDialog_hasExpectedWindowParams(false); - } - - private void createAccessibilityServiceWarningDialog_hasExpectedWindowParams( - boolean expectSystemDialog) { final AlertDialog dialog = AccessibilityServiceWarning.createAccessibilityServiceWarningDialog( mContext, @@ -116,11 +101,7 @@ public class AccessibilityServiceWarningTest { expect.that(dialogWindow.getAttributes().privateFlags & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS).isEqualTo( SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS); - if (expectSystemDialog) { - expect.that(dialogWindow.getAttributes().type).isEqualTo(TYPE_SYSTEM_DIALOG); - } else { - expect.that(dialogWindow.getAttributes().type).isNotEqualTo(TYPE_SYSTEM_DIALOG); - } + expect.that(dialogWindow.getAttributes().type).isNotEqualTo(TYPE_SYSTEM_DIALOG); } @Test diff --git a/core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java b/core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java index 40710577b154..5f25e9315831 100644 --- a/core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java +++ b/core/tests/vibrator/src/android/os/vibrator/persistence/VibrationEffectXmlSerializationTest.java @@ -439,6 +439,498 @@ public class VibrationEffectXmlSerializationTest { } @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testWaveformEnvelopeEffect_allSucceed() throws Exception { + VibrationEffect effect = new VibrationEffect.WaveformEnvelopeBuilder() + .addControlPoint(0.2f, 80f, 10) + .addControlPoint(0.5f, 150f, 10) + .build(); + + String xml = """ + <vibration-effect> + <waveform-envelope-effect> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="10" /> + <control-point amplitude="0.5" frequencyHz="150.0" durationMs="10" /> + </waveform-envelope-effect> + </vibration-effect> + """; + + assertPublicApisParserSucceeds(xml, effect); + assertPublicApisSerializerSucceeds(effect, xml); + assertPublicApisRoundTrip(effect); + assertHiddenApisParserSucceeds(xml, effect); + assertHiddenApisSerializerSucceeds(effect, xml); + assertHiddenApisRoundTrip(effect); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testWaveformEnvelopeEffectWithInitialFrequency_allSucceed() throws Exception { + VibrationEffect effect = new VibrationEffect.WaveformEnvelopeBuilder() + .setInitialFrequencyHz(20) + .addControlPoint(0.2f, 80f, 10) + .addControlPoint(0.5f, 150f, 10) + .build(); + + String xml = """ + <vibration-effect> + <waveform-envelope-effect initialFrequencyHz="20.0"> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="10" /> + <control-point amplitude="0.5" frequencyHz="150.0" durationMs="10" /> + </waveform-envelope-effect> + </vibration-effect> + """; + + assertPublicApisParserSucceeds(xml, effect); + assertPublicApisSerializerSucceeds(effect, xml); + assertPublicApisRoundTrip(effect); + assertHiddenApisParserSucceeds(xml, effect); + assertHiddenApisSerializerSucceeds(effect, xml); + assertHiddenApisRoundTrip(effect); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testWaveformEnvelopeEffect_badXml_throwsException() throws IOException { + // Incomplete XML + assertParseElementFails(""" + <vibration-effect> + <waveform-envelope-effect> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="10" /> + </vibration-effect> + """); + assertParseElementFails(""" + <vibration-effect> + <waveform-envelope-effect> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="10"> + </waveform-envelope-effect> + </vibration-effect> + """); + assertParseElementFails(""" + <vibration-effect> + <waveform-envelope-effect> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="10" /> + </waveform-envelope-effect> + """); + + // Bad vibration XML + assertParseElementFails(""" + <vibration-effect> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="10" /> + </waveform-envelope-effect> + </vibration-effect> + """); + + // "waveform-envelope-effect" tag with invalid attributes + assertParseElementFails(""" + <vibration-effect> + <waveform-envelope-effect init_freq="20.0"> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="10" /> + </waveform-envelope-effect> + </vibration-effect> + """); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testWaveformEnvelopeEffect_noControlPoints_allFail() throws IOException { + String xml = "<vibration-effect><waveform-envelope-effect/></vibration-effect>"; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = "<vibration-effect><waveform-envelope-effect> \n " + + "</waveform-envelope-effect></vibration-effect>"; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = "<vibration-effect><waveform-envelope-effect>invalid</waveform-envelope-effect" + + "></vibration-effect>"; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect> + <control-point /> + </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect initialFrequencyHz="20.0" /> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect initialFrequencyHz="20.0"> \n </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect initialFrequencyHz="20.0"> + invalid + </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect initialFrequencyHz="20.0"> + <control-point /> + </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testWaveformEnvelopeEffect_badControlPointData_allFail() throws IOException { + String xml = """ + <vibration-effect> + <waveform-envelope-effect> + <control-point amplitude="-1" frequencyHz="80.0" durationMs="100" /> + </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect> + <control-point amplitude="0.2" frequencyHz="0" durationMs="100" /> + </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect initialFrequencyHz="0"> + <control-point amplitude="0.2" frequencyHz="30" durationMs="100" /> + </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="0" /> + </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <waveform-envelope-effect> + <control-point amplitude="0.2" /> + </waveform-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + } + + @Test + @DisableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testWaveformEnvelopeEffect_featureFlagDisabled_allFail() throws Exception { + VibrationEffect effect = new VibrationEffect.WaveformEnvelopeBuilder() + .setInitialFrequencyHz(20) + .addControlPoint(0.2f, 80f, 10) + .addControlPoint(0.5f, 150f, 10) + .build(); + + String xml = """ + <vibration-effect> + <waveform-envelope-effect initialFrequencyHz="20.0"> + <control-point amplitude="0.2" frequencyHz="80.0" durationMs="10" /> + <control-point amplitude="0.5" frequencyHz="150.0" durationMs="10" /> + </waveform-envelope-effect> + </vibration-effect> + """; + + assertPublicApisParserFails(xml); + assertPublicApisSerializerFails(effect); + assertHiddenApisParserFails(xml); + assertHiddenApisSerializerFails(effect); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testBasicEnvelopeEffect_allSucceed() throws Exception { + VibrationEffect effect = new VibrationEffect.BasicEnvelopeBuilder() + .addControlPoint(0.2f, 0.5f, 10) + .addControlPoint(0.0f, 1f, 10) + .build(); + + String xml = """ + <vibration-effect> + <basic-envelope-effect> + <control-point intensity="0.2" sharpness="0.5" durationMs="10" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + + assertPublicApisParserSucceeds(xml, effect); + assertPublicApisSerializerSucceeds(effect, xml); + assertPublicApisRoundTrip(effect); + assertHiddenApisParserSucceeds(xml, effect); + assertHiddenApisSerializerSucceeds(effect, xml); + assertHiddenApisRoundTrip(effect); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testBasicEnvelopeEffectWithInitialSharpness_allSucceed() throws Exception { + VibrationEffect effect = new VibrationEffect.BasicEnvelopeBuilder() + .setInitialSharpness(0.3f) + .addControlPoint(0.2f, 0.5f, 10) + .addControlPoint(0.0f, 1f, 10) + .build(); + + String xml = """ + <vibration-effect> + <basic-envelope-effect initialSharpness="0.3"> + <control-point intensity="0.2" sharpness="0.5" durationMs="10" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + + assertPublicApisParserSucceeds(xml, effect); + assertPublicApisSerializerSucceeds(effect, xml); + assertPublicApisRoundTrip(effect); + assertHiddenApisParserSucceeds(xml, effect); + assertHiddenApisSerializerSucceeds(effect, xml); + assertHiddenApisRoundTrip(effect); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testBasicEnvelopeEffect_badXml_throwsException() throws IOException { + // Incomplete XML + assertParseElementFails(""" + <vibration-effect> + <basic-envelope-effect> + <control-point intensity="0.2" sharpness="0.8" durationMs="10" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </vibration-effect> + """); + assertParseElementFails(""" + <vibration-effect> + <basic-envelope-effect> + <control-point intensity="0.2" sharpness="0.8" durationMs="10"> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """); + assertParseElementFails(""" + <vibration-effect> + <basic-envelope-effect> + <control-point intensity="0.2" sharpness="0.8" durationMs="10" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + """); + + // Bad vibration XML + assertParseElementFails(""" + <vibration-effect> + <control-point intensity="0.2" sharpness="0.8" durationMs="10" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """); + + // "basic-envelope-effect" tag with invalid attributes + assertParseElementFails(""" + <vibration-effect> + <basic-envelope-effect init_sharp="20.0"> + <control-point intensity="0.2" sharpness="0.8" durationMs="10" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testBasicEnvelopeEffect_noControlPoints_allFail() throws IOException { + String xml = "<vibration-effect><basic-envelope-effect/></vibration-effect>"; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = "<vibration-effect><basic-envelope-effect> \n " + + "</basic-envelope-effect></vibration-effect>"; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = "<vibration-effect><basic-envelope-effect>invalid</basic-envelope-effect" + + "></vibration-effect>"; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect> + <control-point /> + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect initialSharpness="0.2" /> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect initialSharpness="0.2"> \n </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect initialSharpness="0.2"> + invalid + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect initialSharpness="0.2"> + <control-point /> + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + } + + @Test + @EnableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testBasicEnvelopeEffect_badControlPointData_allFail() throws IOException { + String xml = """ + <vibration-effect> + <basic-envelope-effect> + <control-point intensity="-1" sharpness="0.8" durationMs="100" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect> + <control-point intensity="0.2" sharpness="-1" durationMs="100" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect initialSharpness="-1.0"> + <control-point intensity="0.2" sharpness="0.8" durationMs="0" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect initialSharpness="2.0"> + <control-point intensity="0.2" sharpness="0.8" durationMs="0" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect> + <control-point intensity="0.2" sharpness="0.8" durationMs="10" /> + <control-point intensity="0.5" sharpness="0.8" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + + xml = """ + <vibration-effect> + <basic-envelope-effect> + <control-point intensity="0.2" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + assertPublicApisParserFails(xml); + assertHiddenApisParserFails(xml); + } + + @Test + @DisableFlags(Flags.FLAG_NORMALIZED_PWLE_EFFECTS) + public void testBasicEnvelopeEffect_featureFlagDisabled_allFail() throws Exception { + VibrationEffect effect = new VibrationEffect.BasicEnvelopeBuilder() + .setInitialSharpness(0.3f) + .addControlPoint(0.2f, 0.5f, 10) + .addControlPoint(0.0f, 1f, 10) + .build(); + + String xml = """ + <vibration-effect> + <basic-envelope-effect initialSharpness="0.3"> + <control-point intensity="0.2" sharpness="0.5" durationMs="10" /> + <control-point intensity="0.0" sharpness="1.0" durationMs="10" /> + </basic-envelope-effect> + </vibration-effect> + """; + + assertPublicApisParserFails(xml); + assertPublicApisSerializerFails(effect); + + assertHiddenApisParserFails(xml); + assertHiddenApisSerializerFails(effect); + } + + @Test @EnableFlags(Flags.FLAG_VENDOR_VIBRATION_EFFECTS) public void testVendorEffect_allSucceed() throws Exception { PersistableBundle vendorData = new PersistableBundle(); diff --git a/core/xsd/vibrator/vibration/schema/current.txt b/core/xsd/vibrator/vibration/schema/current.txt index b4148d657b0d..29f8d199c1d1 100644 --- a/core/xsd/vibrator/vibration/schema/current.txt +++ b/core/xsd/vibrator/vibration/schema/current.txt @@ -1,6 +1,23 @@ // Signature format: 2.0 package com.android.internal.vibrator.persistence { + public class BasicControlPoint { + ctor public BasicControlPoint(); + method public long getDurationMs(); + method public float getIntensity(); + method public float getSharpness(); + method public void setDurationMs(long); + method public void setIntensity(float); + method public void setSharpness(float); + } + + public class BasicEnvelopeEffect { + ctor public BasicEnvelopeEffect(); + method public java.util.List<com.android.internal.vibrator.persistence.BasicControlPoint> getControlPoint(); + method public float getInitialSharpness(); + method public void setInitialSharpness(float); + } + public class PredefinedEffect { ctor public PredefinedEffect(); method public com.android.internal.vibrator.persistence.PredefinedEffectName getName(); @@ -47,14 +64,18 @@ package com.android.internal.vibrator.persistence { public class VibrationEffect { ctor public VibrationEffect(); + method public com.android.internal.vibrator.persistence.BasicEnvelopeEffect getBasicEnvelopeEffect_optional(); method public com.android.internal.vibrator.persistence.PredefinedEffect getPredefinedEffect_optional(); method public com.android.internal.vibrator.persistence.PrimitiveEffect getPrimitiveEffect_optional(); method public byte[] getVendorEffect_optional(); method public com.android.internal.vibrator.persistence.WaveformEffect getWaveformEffect_optional(); + method public com.android.internal.vibrator.persistence.WaveformEnvelopeEffect getWaveformEnvelopeEffect_optional(); + method public void setBasicEnvelopeEffect_optional(com.android.internal.vibrator.persistence.BasicEnvelopeEffect); method public void setPredefinedEffect_optional(com.android.internal.vibrator.persistence.PredefinedEffect); method public void setPrimitiveEffect_optional(com.android.internal.vibrator.persistence.PrimitiveEffect); method public void setVendorEffect_optional(byte[]); method public void setWaveformEffect_optional(com.android.internal.vibrator.persistence.WaveformEffect); + method public void setWaveformEnvelopeEffect_optional(com.android.internal.vibrator.persistence.WaveformEnvelopeEffect); } public class VibrationSelect { @@ -67,6 +88,16 @@ package com.android.internal.vibrator.persistence { enum_constant public static final com.android.internal.vibrator.persistence.WaveformAmplitudeDefault _default; } + public class WaveformControlPoint { + ctor public WaveformControlPoint(); + method public float getAmplitude(); + method public long getDurationMs(); + method public float getFrequencyHz(); + method public void setAmplitude(float); + method public void setDurationMs(long); + method public void setFrequencyHz(float); + } + public class WaveformEffect { ctor public WaveformEffect(); method public com.android.internal.vibrator.persistence.WaveformEffect.Repeating getRepeating(); @@ -87,6 +118,13 @@ package com.android.internal.vibrator.persistence { method public void setDurationMs(java.math.BigInteger); } + public class WaveformEnvelopeEffect { + ctor public WaveformEnvelopeEffect(); + method public java.util.List<com.android.internal.vibrator.persistence.WaveformControlPoint> getControlPoint(); + method public float getInitialFrequencyHz(); + method public void setInitialFrequencyHz(float); + } + public class XmlParser { ctor public XmlParser(); method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; diff --git a/core/xsd/vibrator/vibration/vibration-plus-hidden-apis.xsd b/core/xsd/vibrator/vibration/vibration-plus-hidden-apis.xsd index 910a9b700b5c..b4df2d187702 100644 --- a/core/xsd/vibrator/vibration/vibration-plus-hidden-apis.xsd +++ b/core/xsd/vibrator/vibration/vibration-plus-hidden-apis.xsd @@ -54,6 +54,12 @@ <xs:element name="primitive-effect" type="PrimitiveEffect"/> </xs:sequence> + <!-- Waveform envelope effect --> + <xs:element name="waveform-envelope-effect" type="WaveformEnvelopeEffect"/> + + <!-- Basic envelope effect --> + <xs:element name="basic-envelope-effect" type="BasicEnvelopeEffect"/> + </xs:choice> </xs:complexType> @@ -180,4 +186,54 @@ </xs:restriction> </xs:simpleType> + <!-- Definition of a waveform envelope effect --> + <xs:complexType name="WaveformEnvelopeEffect"> + <xs:sequence> + <xs:element name="control-point" maxOccurs="unbounded" minOccurs="1" + type="WaveformControlPoint" /> + </xs:sequence> + <xs:attribute name="initialFrequencyHz" type="ControlPointFrequency" /> + </xs:complexType> + + <!-- Definition of a basic envelope effect --> + <xs:complexType name="BasicEnvelopeEffect"> + <xs:sequence> + <xs:element name="control-point" maxOccurs="unbounded" minOccurs="1" + type="BasicControlPoint" /> + </xs:sequence> + <xs:attribute name="initialSharpness" type="NormalizedControlPointUnit" /> + </xs:complexType> + + <xs:complexType name="WaveformControlPoint"> + <xs:attribute name="amplitude" type="NormalizedControlPointUnit" use="required"/> + <xs:attribute name="frequencyHz" type="ControlPointFrequency" use="required"/> + <xs:attribute name="durationMs" type="PositiveLong" use="required"/> + </xs:complexType> + + <xs:complexType name="BasicControlPoint"> + <xs:attribute name="intensity" type="NormalizedControlPointUnit" use="required"/> + <xs:attribute name="sharpness" type="NormalizedControlPointUnit" use="required"/> + <xs:attribute name="durationMs" type="PositiveLong" use="required"/> + </xs:complexType> + + <xs:simpleType name="ControlPointFrequency"> + <xs:restriction base="xs:float"> + <xs:minExclusive value="0"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="PositiveLong"> + <xs:restriction base="xs:long"> + <xs:minExclusive value="0"/> + </xs:restriction> + </xs:simpleType> + + <!-- Normalized control point unit float in [0,1] --> + <xs:simpleType name="NormalizedControlPointUnit"> + <xs:restriction base="xs:float"> + <xs:minInclusive value="0"/> + <xs:maxInclusive value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:schema> diff --git a/core/xsd/vibrator/vibration/vibration.xsd b/core/xsd/vibrator/vibration/vibration.xsd index 3c8e01605659..fba966faa9c9 100644 --- a/core/xsd/vibrator/vibration/vibration.xsd +++ b/core/xsd/vibrator/vibration/vibration.xsd @@ -52,6 +52,12 @@ <xs:element name="primitive-effect" type="PrimitiveEffect"/> </xs:sequence> + <!-- Waveform envelope effect --> + <xs:element name="waveform-envelope-effect" type="WaveformEnvelopeEffect"/> + + <!-- Basic envelope effect --> + <xs:element name="basic-envelope-effect" type="BasicEnvelopeEffect"/> + </xs:choice> </xs:complexType> @@ -157,4 +163,54 @@ </xs:restriction> </xs:simpleType> + <!-- Definition of a waveform envelope effect --> + <xs:complexType name="WaveformEnvelopeEffect"> + <xs:sequence> + <xs:element name="control-point" maxOccurs="unbounded" minOccurs="1" + type="WaveformControlPoint" /> + </xs:sequence> + <xs:attribute name="initialFrequencyHz" type="ControlPointFrequency" /> + </xs:complexType> + + <!-- Definition of a basic envelope effect --> + <xs:complexType name="BasicEnvelopeEffect"> + <xs:sequence> + <xs:element name="control-point" maxOccurs="unbounded" minOccurs="1" + type="BasicControlPoint" /> + </xs:sequence> + <xs:attribute name="initialSharpness" type="NormalizedControlPointUnit" /> + </xs:complexType> + + <xs:complexType name="WaveformControlPoint"> + <xs:attribute name="amplitude" type="NormalizedControlPointUnit" use="required"/> + <xs:attribute name="frequencyHz" type="ControlPointFrequency" use="required"/> + <xs:attribute name="durationMs" type="PositiveLong" use="required"/> + </xs:complexType> + + <xs:complexType name="BasicControlPoint"> + <xs:attribute name="intensity" type="NormalizedControlPointUnit" use="required"/> + <xs:attribute name="sharpness" type="NormalizedControlPointUnit" use="required"/> + <xs:attribute name="durationMs" type="PositiveLong" use="required"/> + </xs:complexType> + + <xs:simpleType name="ControlPointFrequency"> + <xs:restriction base="xs:float"> + <xs:minExclusive value="0"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="PositiveLong"> + <xs:restriction base="xs:long"> + <xs:minExclusive value="0"/> + </xs:restriction> + </xs:simpleType> + + <!-- Normalized control point unit float in [0,1] --> + <xs:simpleType name="NormalizedControlPointUnit"> + <xs:restriction base="xs:float"> + <xs:minInclusive value="0"/> + <xs:maxInclusive value="1"/> + </xs:restriction> + </xs:simpleType> + </xs:schema> diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 897fc543517e..a26f5e383586 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -514,7 +514,6 @@ applications that come with the platform <permission name="android.permission.RENOUNCE_PERMISSIONS" /> <permission name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" /> <permission name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE" /> - <permission name="android.permission.READ_DROPBOX_DATA" /> <permission name="android.permission.READ_LOGS" /> <permission name="android.permission.BRIGHTNESS_SLIDER_USAGE" /> <permission name="android.permission.ACCESS_AMBIENT_LIGHT_STATS" /> diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 073307c7a2e8..d010c525e099 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -301,10 +301,7 @@ public class Path { * * @param bounds Returns the computed bounds of the path's control points. * @param exact This parameter is no longer used. - * - * @deprecated use computeBounds(RectF) instead */ - @Deprecated @SuppressWarnings({"UnusedDeclaration"}) public void computeBounds(@NonNull RectF bounds, boolean exact) { computeBounds(bounds); diff --git a/keystore/java/Android.bp b/keystore/java/Android.bp index 21edff1e1c96..264ac5ff1d92 100644 --- a/keystore/java/Android.bp +++ b/keystore/java/Android.bp @@ -13,5 +13,13 @@ filegroup { "**/*.java", "**/*.aidl", ], + exclude_srcs: select(release_flag("RELEASE_ATTEST_MODULES"), { + true: [ + "android/security/KeyStore2HalCurrent.java", + ], + default: [ + "android/security/KeyStore2HalLatest.java", + ], + }), visibility: ["//frameworks/base"], } diff --git a/keystore/java/android/security/KeyStore2.java b/keystore/java/android/security/KeyStore2.java index dd703f5eefb9..f5cf571ad955 100644 --- a/keystore/java/android/security/KeyStore2.java +++ b/keystore/java/android/security/KeyStore2.java @@ -101,7 +101,7 @@ public class KeyStore2 { R execute(IKeystoreService service) throws RemoteException; } - private <R> R handleRemoteExceptionWithRetry(@NonNull CheckedRemoteRequest<R> request) + <R> R handleRemoteExceptionWithRetry(@NonNull CheckedRemoteRequest<R> request) throws KeyStoreException { IKeystoreService service = getService(false /* retryLookup */); boolean firstTry = true; @@ -369,6 +369,18 @@ public class KeyStore2 { } } + /** + * Returns tag-specific info required to interpret a tag's attested value. + * @see IKeystoreService#getSupplementaryAttestationInfo(Tag) for more details. + * @param tag + * @return + * @throws KeyStoreException + * @hide + */ + public byte[] getSupplementaryAttestationInfo(int tag) throws KeyStoreException { + return KeyStore2HalVersion.getSupplementaryAttestationInfoHelper(tag, this); + } + static KeyStoreException getKeyStoreException(int errorCode, String serviceErrorMessage) { if (errorCode > 0) { // KeyStore layer error diff --git a/keystore/java/android/security/KeyStore2HalCurrent.java b/keystore/java/android/security/KeyStore2HalCurrent.java new file mode 100644 index 000000000000..f4d8fe65c995 --- /dev/null +++ b/keystore/java/android/security/KeyStore2HalCurrent.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.security; + +/** + * @hide This class is necessary to allow the version of the AIDL interface for Keystore and +* KeyMint used in KeyStore2.java to differ by BUILD flag `RELEASE_ATTEST_MODULES`. When +* `RELEASE_ATTEST_MODULES` is not set, this file is included, and the current HALs for Keystore +* (V4) and KeyMint (V3) are used. +*/ +class KeyStore2HalVersion { + public static byte[] getSupplementaryAttestationInfoHelper(int tag, KeyStore2 ks) + throws KeyStoreException { + return new byte[0]; + } +} diff --git a/keystore/java/android/security/KeyStore2HalLatest.java b/keystore/java/android/security/KeyStore2HalLatest.java new file mode 100644 index 000000000000..123f1c0b8f39 --- /dev/null +++ b/keystore/java/android/security/KeyStore2HalLatest.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.security; + +/** + * @hide This class is necessary to allow the version of the AIDL interface for Keystore and +* KeyMint used in KeyStore2.java to differ by BUILD flag `RELEASE_ATTEST_MODULES`. When +* `RELEASE_ATTEST_MODULES` is set, this file is included, and the latest HALs for Keystore (V5) +* and KeyMint (V4) are used. +*/ +class KeyStore2HalVersion { + public static byte[] getSupplementaryAttestationInfoHelper(int tag, KeyStore2 ks) + throws KeyStoreException { + return ks.handleRemoteExceptionWithRetry( + (service) -> service.getSupplementaryAttestationInfo(tag)); + } +} diff --git a/keystore/java/android/security/keystore/KeyStoreManager.java b/keystore/java/android/security/keystore/KeyStoreManager.java index e6091c1da8a5..740ccb53a691 100644 --- a/keystore/java/android/security/keystore/KeyStoreManager.java +++ b/keystore/java/android/security/keystore/KeyStoreManager.java @@ -17,9 +17,11 @@ package android.security.keystore; import android.annotation.FlaggedApi; +import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemService; import android.content.Context; +import android.hardware.security.keymint.TagType; import android.security.KeyStore2; import android.security.KeyStoreException; import android.security.keystore2.AndroidKeyStoreProvider; @@ -32,6 +34,8 @@ import android.util.Log; import com.android.internal.annotations.GuardedBy; import java.io.ByteArrayInputStream; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.security.Key; import java.security.KeyPair; import java.security.PublicKey; @@ -299,6 +303,37 @@ public final class KeyStoreManager { return Collections.emptyList(); } + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef(value = {MODULE_HASH}) + public @interface SupplementaryAttestationInfoTagEnum {} + + /** + * When passed into getSupplementaryAttestationInfo, getSupplementaryAttestationInfo returns the + * DER-encoded structure corresponding to the `Modules` schema described in the KeyMint HAL's + * KeyCreationResult.aidl. The SHA-256 hash of this encoded structure is what's included with + * the tag in attestations. + */ + // TODO(b/369375199): Replace with Tag.MODULE_HASH when flagging is removed. + public static final int MODULE_HASH = TagType.BYTES | 724; + + /** + * Returns tag-specific data required to interpret a tag's attested value. + * + * When performing key attestation, the obtained attestation certificate contains a list of tags + * and their corresponding attested values. For some tags, additional information about the + * attested value can be queried via this API. See individual tags for specifics. + * + * @param tag tag for which info is being requested + * @return tag-specific info + * @throws KeyStoreException if the requested info is not available + */ + @FlaggedApi(android.security.keystore2.Flags.FLAG_ATTEST_MODULES) + public @NonNull byte[] getSupplementaryAttestationInfo( + @SupplementaryAttestationInfoTagEnum int tag) throws KeyStoreException { + return mKeyStore2.getSupplementaryAttestationInfo(tag); + } + /** * Returns a new {@link KeyDescriptor} instance in the app domain / namespace with the {@code * alias} set to the provided value. diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/TestShellExecutor.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/TestShellExecutor.kt new file mode 100644 index 000000000000..ef8e71c2590b --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/TestShellExecutor.kt @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell + +import com.android.wm.shell.common.ShellExecutor + +/** + * Simple implementation of [ShellExecutor] that collects all runnables and executes them + * sequentially once [flushAll] is called + */ +class TestShellExecutor : ShellExecutor { + + private val runnables: MutableList<Runnable> = mutableListOf() + + override fun execute(runnable: Runnable) { + runnables.add(runnable) + } + + override fun executeDelayed(runnable: Runnable, delayMillis: Long) { + execute(runnable) + } + + override fun removeCallbacks(runnable: Runnable?) {} + + override fun hasCallback(runnable: Runnable?): Boolean = false + + /** + * Execute all posted runnables sequentially + */ + fun flushAll() { + while (runnables.isNotEmpty()) { + runnables.removeAt(0).run() + } + } +} diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt index f535fbd653c5..2b4e5417f188 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleControllerBubbleBarTest.kt @@ -34,6 +34,7 @@ import com.android.internal.protolog.ProtoLog import com.android.internal.statusbar.IStatusBarService import com.android.wm.shell.Flags import com.android.wm.shell.ShellTaskOrganizer +import com.android.wm.shell.TestShellExecutor import com.android.wm.shell.WindowManagerShellWrapper import com.android.wm.shell.bubbles.Bubbles.SysuiProxy import com.android.wm.shell.bubbles.properties.ProdBubbleProperties @@ -41,7 +42,6 @@ import com.android.wm.shell.bubbles.storage.BubblePersistentRepository import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.DisplayInsetsController import com.android.wm.shell.common.FloatingContentCoordinator -import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.common.SyncTransactionQueue import com.android.wm.shell.common.TaskStackListenerImpl import com.android.wm.shell.draganddrop.DragAndDropController @@ -84,16 +84,16 @@ class BubbleControllerBubbleBarTest { private lateinit var uiEventLoggerFake: UiEventLoggerFake private lateinit var bubblePositioner: BubblePositioner private lateinit var bubbleData: BubbleData - private lateinit var mainExecutor: TestExecutor - private lateinit var bgExecutor: TestExecutor + private lateinit var mainExecutor: TestShellExecutor + private lateinit var bgExecutor: TestShellExecutor @Before fun setUp() { ProtoLog.REQUIRE_PROTOLOGTOOL = false ProtoLog.init() - mainExecutor = TestExecutor() - bgExecutor = TestExecutor() + mainExecutor = TestShellExecutor() + bgExecutor = TestShellExecutor() uiEventLoggerFake = UiEventLoggerFake() val bubbleLogger = BubbleLogger(uiEventLoggerFake) @@ -232,8 +232,8 @@ class BubbleControllerBubbleBarTest { bubbleData: BubbleData, bubbleLogger: BubbleLogger, bubblePositioner: BubblePositioner, - mainExecutor: TestExecutor, - bgExecutor: TestExecutor, + mainExecutor: TestShellExecutor, + bgExecutor: TestShellExecutor, ): BubbleController { val shellCommandHandler = ShellCommandHandler() val shellController = @@ -289,29 +289,6 @@ class BubbleControllerBubbleBarTest { ) } - private class TestExecutor : ShellExecutor { - - private val runnables: MutableList<Runnable> = mutableListOf() - - override fun execute(runnable: Runnable) { - runnables.add(runnable) - } - - override fun executeDelayed(runnable: Runnable, delayMillis: Long) { - execute(runnable) - } - - override fun removeCallbacks(runnable: Runnable?) {} - - override fun hasCallback(runnable: Runnable?): Boolean = false - - fun flushAll() { - while (runnables.isNotEmpty()) { - runnables.removeAt(0).run() - } - } - } - private class FakeBubblesStateListener : Bubbles.BubbleStateListener { override fun onBubbleStateChange(update: BubbleBarUpdate?) {} diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt index 5f42bb161204..239acd37f286 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleStackViewTest.kt @@ -31,20 +31,16 @@ import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import androidx.test.platform.app.InstrumentationRegistry -import com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.protolog.ProtoLog import com.android.launcher3.icons.BubbleIconFactory import com.android.wm.shell.Flags import com.android.wm.shell.R +import com.android.wm.shell.TestShellExecutor import com.android.wm.shell.bubbles.Bubbles.SysuiProxy import com.android.wm.shell.bubbles.animation.AnimatableScaleMatrix import com.android.wm.shell.common.FloatingContentCoordinator -import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.shared.animation.PhysicsAnimatorTestUtils -import com.android.wm.shell.shared.bubbles.BubbleBarLocation -import com.android.wm.shell.taskview.TaskView -import com.android.wm.shell.taskview.TaskViewTaskController import com.google.common.truth.Truth.assertThat import com.google.common.util.concurrent.MoreExecutors.directExecutor import org.junit.After @@ -52,6 +48,7 @@ import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith +import org.mockito.Mockito import org.mockito.kotlin.mock import org.mockito.kotlin.verify import java.util.concurrent.Semaphore @@ -71,7 +68,7 @@ class BubbleStackViewTest { private lateinit var iconFactory: BubbleIconFactory private lateinit var expandedViewManager: FakeBubbleExpandedViewManager private lateinit var bubbleStackView: BubbleStackView - private lateinit var shellExecutor: ShellExecutor + private lateinit var shellExecutor: TestShellExecutor private lateinit var windowManager: WindowManager private lateinit var bubbleTaskViewFactory: BubbleTaskViewFactory private lateinit var bubbleData: BubbleData @@ -108,7 +105,7 @@ class BubbleStackViewTest { ) bubbleStackViewManager = FakeBubbleStackViewManager() expandedViewManager = FakeBubbleExpandedViewManager() - bubbleTaskViewFactory = FakeBubbleTaskViewFactory() + bubbleTaskViewFactory = FakeBubbleTaskViewFactory(context, shellExecutor) bubbleStackView = BubbleStackView( context, @@ -168,6 +165,7 @@ class BubbleStackViewTest { // This will eventually propagate an update back to the stack view, but setting the // entire pipeline is outside the scope of a unit test. assertThat(bubbleData.isExpanded).isTrue() + shellExecutor.flushAll() } assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue() @@ -206,6 +204,7 @@ class BubbleStackViewTest { bubbleStackView.setSelectedBubble(bubble2) bubbleStackView.isExpanded = true + shellExecutor.flushAll() } assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue() @@ -223,6 +222,7 @@ class BubbleStackViewTest { // tap on bubble1 to select it InstrumentationRegistry.getInstrumentation().runOnMainSync { bubble1.iconView!!.performClick() + shellExecutor.flushAll() } assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue() assertThat(bubbleData.selectedBubble).isEqualTo(bubble1) @@ -233,6 +233,7 @@ class BubbleStackViewTest { // listener wired up. bubbleStackView.setSelectedBubble(bubble1) bubble1.iconView!!.performClick() + shellExecutor.flushAll() } assertThat(semaphore.tryAcquire(5, TimeUnit.SECONDS)).isTrue() @@ -355,7 +356,7 @@ class BubbleStackViewTest { @Test fun removeFromWindow_stopMonitoringSwipeUpGesture() { - spyOn(bubbleStackView) + bubbleStackView = Mockito.spy(bubbleStackView) InstrumentationRegistry.getInstrumentation().runOnMainSync { // No way to add to window in the test environment right now so just pretend bubbleStackView.onDetachedFromWindow() @@ -426,55 +427,4 @@ class BubbleStackViewTest { override fun hideCurrentInputMethod() {} } - - private class TestShellExecutor : ShellExecutor { - - override fun execute(runnable: Runnable) { - runnable.run() - } - - override fun executeDelayed(r: Runnable, delayMillis: Long) { - r.run() - } - - override fun removeCallbacks(r: Runnable?) {} - - override fun hasCallback(r: Runnable): Boolean = false - } - - private inner class FakeBubbleTaskViewFactory : BubbleTaskViewFactory { - override fun create(): BubbleTaskView { - val taskViewTaskController = mock<TaskViewTaskController>() - val taskView = TaskView(context, taskViewTaskController) - return BubbleTaskView(taskView, shellExecutor) - } - } - - private inner class FakeBubbleExpandedViewManager : BubbleExpandedViewManager { - - override val overflowBubbles: List<Bubble> - get() = emptyList() - - override fun setOverflowListener(listener: BubbleData.Listener) {} - - override fun collapseStack() {} - - override fun updateWindowFlagsForBackpress(intercept: Boolean) {} - - override fun promoteBubbleFromOverflow(bubble: Bubble) {} - - override fun removeBubble(key: String, reason: Int) {} - - override fun dismissBubble(bubble: Bubble, reason: Int) {} - - override fun setAppBubbleTaskId(key: String, taskId: Int) {} - - override fun isStackExpanded(): Boolean = false - - override fun isShowingAsBubbleBar(): Boolean = false - - override fun hideCurrentInputMethod() {} - - override fun updateBubbleBarLocation(location: BubbleBarLocation, source: Int) {} - } } diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleViewInfoTaskTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleViewInfoTaskTest.kt index 776ea9226b06..680d015dfd2f 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleViewInfoTaskTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/BubbleViewInfoTaskTest.kt @@ -35,13 +35,13 @@ import com.android.internal.protolog.ProtoLog import com.android.internal.statusbar.IStatusBarService import com.android.launcher3.icons.BubbleIconFactory import com.android.wm.shell.ShellTaskOrganizer +import com.android.wm.shell.TestShellExecutor import com.android.wm.shell.WindowManagerShellWrapper import com.android.wm.shell.bubbles.properties.BubbleProperties import com.android.wm.shell.bubbles.storage.BubblePersistentRepository import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.DisplayInsetsController import com.android.wm.shell.common.FloatingContentCoordinator -import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.common.SyncTransactionQueue import com.android.wm.shell.common.TaskStackListenerImpl import com.android.wm.shell.shared.TransactionPool @@ -70,8 +70,8 @@ class BubbleViewInfoTaskTest { private lateinit var metadataFlagListener: Bubbles.BubbleMetadataFlagListener private lateinit var iconFactory: BubbleIconFactory private lateinit var bubbleController: BubbleController - private lateinit var mainExecutor: TestExecutor - private lateinit var bgExecutor: TestExecutor + private lateinit var mainExecutor: TestShellExecutor + private lateinit var bgExecutor: TestShellExecutor private lateinit var bubbleStackView: BubbleStackView private lateinit var bubblePositioner: BubblePositioner private lateinit var bubbleLogger: BubbleLogger @@ -94,8 +94,8 @@ class BubbleViewInfoTaskTest { context.resources.getDimensionPixelSize(R.dimen.importance_ring_stroke_width) ) - mainExecutor = TestExecutor() - bgExecutor = TestExecutor() + mainExecutor = TestShellExecutor() + bgExecutor = TestShellExecutor() val windowManager = context.getSystemService(WindowManager::class.java) val shellInit = ShellInit(mainExecutor) val shellCommandHandler = ShellCommandHandler() @@ -335,27 +335,4 @@ class BubbleViewInfoTaskTest { bgExecutor ) } - - private class TestExecutor : ShellExecutor { - - private val runnables: MutableList<Runnable> = mutableListOf() - - override fun execute(runnable: Runnable) { - runnables.add(runnable) - } - - override fun executeDelayed(runnable: Runnable, delayMillis: Long) { - execute(runnable) - } - - override fun removeCallbacks(runnable: Runnable?) {} - - override fun hasCallback(runnable: Runnable?): Boolean = false - - fun flushAll() { - while (runnables.isNotEmpty()) { - runnables.removeAt(0).run() - } - } - } } diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleExpandedViewManager.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleExpandedViewManager.kt new file mode 100644 index 000000000000..3c013d3636e8 --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleExpandedViewManager.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.bubbles + +import com.android.wm.shell.shared.bubbles.BubbleBarLocation +import java.util.Collections + +/** Fake implementation of [BubbleExpandedViewManager] for testing. */ +class FakeBubbleExpandedViewManager(var bubbleBar: Boolean = false, var expanded: Boolean = false) : + BubbleExpandedViewManager { + + override val overflowBubbles: List<Bubble> + get() = Collections.emptyList() + + override fun setOverflowListener(listener: BubbleData.Listener) {} + + override fun collapseStack() {} + + override fun updateWindowFlagsForBackpress(intercept: Boolean) {} + + override fun promoteBubbleFromOverflow(bubble: Bubble) {} + + override fun removeBubble(key: String, reason: Int) {} + + override fun dismissBubble(bubble: Bubble, reason: Int) {} + + override fun setAppBubbleTaskId(key: String, taskId: Int) {} + + override fun isStackExpanded(): Boolean { + return expanded + } + + override fun isShowingAsBubbleBar(): Boolean { + return bubbleBar + } + + override fun hideCurrentInputMethod() {} + + override fun updateBubbleBarLocation(location: BubbleBarLocation, source: Int) {} +} diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleFactory.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleFactory.kt index 3279d561d4f1..bcaa63bfad36 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleFactory.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleFactory.kt @@ -19,6 +19,10 @@ package com.android.wm.shell.bubbles import android.content.Context import android.content.pm.ShortcutInfo import android.content.res.Resources +import android.view.LayoutInflater +import com.android.internal.logging.testing.UiEventLoggerFake +import com.android.wm.shell.R +import com.android.wm.shell.TestShellExecutor import com.android.wm.shell.bubbles.BubbleViewInfoTask.BubbleViewInfo import com.android.wm.shell.bubbles.bar.BubbleBarExpandedView import com.google.common.util.concurrent.MoreExecutors.directExecutor @@ -27,6 +31,33 @@ import com.google.common.util.concurrent.MoreExecutors.directExecutor class FakeBubbleFactory { companion object { + fun createExpandedView( + context: Context, + bubblePositioner: BubblePositioner, + expandedViewManager: BubbleExpandedViewManager, + bubbleTaskView: BubbleTaskView, + mainExecutor: TestShellExecutor, + bgExecutor: TestShellExecutor, + bubbleLogger: BubbleLogger = BubbleLogger(UiEventLoggerFake()), + ): BubbleBarExpandedView { + val bubbleBarExpandedView = + (LayoutInflater.from(context) + .inflate(R.layout.bubble_bar_expanded_view, null, false /* attachToRoot */) + as BubbleBarExpandedView) + .apply { + initialize( + expandedViewManager, + bubblePositioner, + bubbleLogger, + false, /* isOverflow */ + bubbleTaskView, + mainExecutor, + bgExecutor, + null, /* regionSamplingProvider */ + ) + } + return bubbleBarExpandedView + } fun createViewInfo(bubbleExpandedView: BubbleBarExpandedView): BubbleViewInfo { return BubbleViewInfo().apply { bubbleBarExpandedView = bubbleExpandedView } diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleTaskViewFactory.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleTaskViewFactory.kt new file mode 100644 index 000000000000..42b66aa29bfc --- /dev/null +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/FakeBubbleTaskViewFactory.kt @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.bubbles + +import android.app.ActivityManager +import android.content.Context +import com.android.wm.shell.common.ShellExecutor +import com.android.wm.shell.taskview.TaskView +import com.android.wm.shell.taskview.TaskViewTaskController +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever + +/** + * Implementation of [BubbleTaskViewFactory] for testing. + */ +class FakeBubbleTaskViewFactory( + private val context: Context, + private val mainExecutor: ShellExecutor, +) : BubbleTaskViewFactory { + override fun create(): BubbleTaskView { + val taskViewTaskController = mock<TaskViewTaskController>() + val taskView = TaskView(context, taskViewTaskController) + val taskInfo = mock<ActivityManager.RunningTaskInfo>() + whenever(taskViewTaskController.taskInfo).thenReturn(taskInfo) + return BubbleTaskView(taskView, mainExecutor) + } +} diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt index 1bf6af8d1f6d..bfc798bb9c79 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedViewTest.kt @@ -33,32 +33,30 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation import com.android.internal.logging.testing.UiEventLoggerFake import com.android.internal.protolog.ProtoLog import com.android.wm.shell.R +import com.android.wm.shell.TestShellExecutor import com.android.wm.shell.bubbles.Bubble -import com.android.wm.shell.bubbles.BubbleData import com.android.wm.shell.bubbles.BubbleExpandedViewManager import com.android.wm.shell.bubbles.BubbleLogger import com.android.wm.shell.bubbles.BubblePositioner import com.android.wm.shell.bubbles.BubbleTaskView import com.android.wm.shell.bubbles.BubbleTaskViewFactory import com.android.wm.shell.bubbles.DeviceConfig +import com.android.wm.shell.bubbles.FakeBubbleExpandedViewManager import com.android.wm.shell.bubbles.RegionSamplingProvider import com.android.wm.shell.bubbles.UiEventSubject.Companion.assertThat -import com.android.wm.shell.common.ShellExecutor -import com.android.wm.shell.shared.bubbles.BubbleBarLocation import com.android.wm.shell.shared.handles.RegionSamplingHelper import com.android.wm.shell.taskview.TaskView import com.android.wm.shell.taskview.TaskViewTaskController import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertWithMessage import com.google.common.util.concurrent.MoreExecutors.directExecutor -import java.util.Collections -import java.util.concurrent.Executor import org.junit.After import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.kotlin.mock import org.mockito.kotlin.whenever +import java.util.concurrent.Executor /** Tests for [BubbleBarExpandedViewTest] */ @SmallTest @@ -72,8 +70,8 @@ class BubbleBarExpandedViewTest { private val context = ApplicationProvider.getApplicationContext<Context>() private val windowManager = context.getSystemService(WindowManager::class.java) - private lateinit var mainExecutor: TestExecutor - private lateinit var bgExecutor: TestExecutor + private lateinit var mainExecutor: TestShellExecutor + private lateinit var bgExecutor: TestShellExecutor private lateinit var expandedViewManager: BubbleExpandedViewManager private lateinit var positioner: BubblePositioner @@ -90,8 +88,8 @@ class BubbleBarExpandedViewTest { fun setUp() { ProtoLog.REQUIRE_PROTOLOGTOOL = false ProtoLog.init() - mainExecutor = TestExecutor() - bgExecutor = TestExecutor() + mainExecutor = TestShellExecutor() + bgExecutor = TestShellExecutor() positioner = BubblePositioner(context, windowManager) positioner.setShowingInBubbleBar(true) val deviceConfig = @@ -105,7 +103,7 @@ class BubbleBarExpandedViewTest { ) positioner.update(deviceConfig) - expandedViewManager = createExpandedViewManager() + expandedViewManager = FakeBubbleExpandedViewManager(bubbleBar = true, expanded = true) bubbleTaskView = FakeBubbleTaskViewFactory().create() val inflater = LayoutInflater.from(context) @@ -426,63 +424,4 @@ class BubbleBarExpandedViewTest { setWindowInvisible = false } } - - private fun createExpandedViewManager(): BubbleExpandedViewManager { - return object : BubbleExpandedViewManager { - override val overflowBubbles: List<Bubble> - get() = Collections.emptyList() - - override fun setOverflowListener(listener: BubbleData.Listener) { - } - - override fun collapseStack() { - } - - override fun updateWindowFlagsForBackpress(intercept: Boolean) { - } - - override fun promoteBubbleFromOverflow(bubble: Bubble) { - } - - override fun removeBubble(key: String, reason: Int) { - } - - override fun dismissBubble(bubble: Bubble, reason: Int) { - } - - override fun setAppBubbleTaskId(key: String, taskId: Int) { - } - - override fun isStackExpanded(): Boolean { - return true - } - - override fun isShowingAsBubbleBar(): Boolean { - return true - } - - override fun hideCurrentInputMethod() { - } - - override fun updateBubbleBarLocation(location: BubbleBarLocation, source: Int) { - } - } - } - - private class TestExecutor : ShellExecutor { - - private val runnables: MutableList<Runnable> = mutableListOf() - - override fun execute(runnable: Runnable) { - runnables.add(runnable) - } - - override fun executeDelayed(runnable: Runnable, delayMillis: Long) { - execute(runnable) - } - - override fun removeCallbacks(runnable: Runnable?) {} - - override fun hasCallback(runnable: Runnable?): Boolean = false - } -}
\ No newline at end of file +} diff --git a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerViewTest.kt b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerViewTest.kt index 7280f8aa07a6..04c9ffbac287 100644 --- a/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerViewTest.kt +++ b/libs/WindowManager/Shell/multivalentTests/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerViewTest.kt @@ -16,14 +16,12 @@ package com.android.wm.shell.bubbles.bar -import android.app.ActivityManager import android.content.Context import android.content.pm.LauncherApps import android.graphics.PointF import android.os.Handler import android.os.UserManager import android.view.IWindowManager -import android.view.LayoutInflater import android.view.MotionEvent import android.view.View import android.view.WindowManager @@ -37,19 +35,19 @@ import com.android.internal.protolog.ProtoLog import com.android.internal.statusbar.IStatusBarService import com.android.wm.shell.R import com.android.wm.shell.ShellTaskOrganizer +import com.android.wm.shell.TestShellExecutor import com.android.wm.shell.WindowManagerShellWrapper import com.android.wm.shell.bubbles.Bubble import com.android.wm.shell.bubbles.BubbleController import com.android.wm.shell.bubbles.BubbleData import com.android.wm.shell.bubbles.BubbleDataRepository import com.android.wm.shell.bubbles.BubbleEducationController -import com.android.wm.shell.bubbles.BubbleExpandedViewManager import com.android.wm.shell.bubbles.BubbleLogger import com.android.wm.shell.bubbles.BubblePositioner -import com.android.wm.shell.bubbles.BubbleTaskView -import com.android.wm.shell.bubbles.BubbleTaskViewFactory import com.android.wm.shell.bubbles.Bubbles.SysuiProxy +import com.android.wm.shell.bubbles.FakeBubbleExpandedViewManager import com.android.wm.shell.bubbles.FakeBubbleFactory +import com.android.wm.shell.bubbles.FakeBubbleTaskViewFactory import com.android.wm.shell.bubbles.UiEventSubject.Companion.assertThat import com.android.wm.shell.bubbles.animation.AnimatableScaleMatrix import com.android.wm.shell.bubbles.properties.BubbleProperties @@ -57,7 +55,6 @@ import com.android.wm.shell.bubbles.storage.BubblePersistentRepository import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.DisplayInsetsController import com.android.wm.shell.common.FloatingContentCoordinator -import com.android.wm.shell.common.ShellExecutor import com.android.wm.shell.common.SyncTransactionQueue import com.android.wm.shell.common.TaskStackListenerImpl import com.android.wm.shell.shared.TransactionPool @@ -66,20 +63,16 @@ import com.android.wm.shell.shared.bubbles.BubbleBarLocation import com.android.wm.shell.sysui.ShellCommandHandler import com.android.wm.shell.sysui.ShellController import com.android.wm.shell.sysui.ShellInit -import com.android.wm.shell.taskview.TaskView -import com.android.wm.shell.taskview.TaskViewTaskController import com.android.wm.shell.taskview.TaskViewTransitions import com.android.wm.shell.transition.Transitions import com.google.common.truth.Truth.assertThat import org.junit.After -import java.util.Collections import org.junit.Before import org.junit.ClassRule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.mock import org.mockito.kotlin.mock -import org.mockito.kotlin.whenever /** Tests for [BubbleBarLayerView] */ @SmallTest @@ -87,8 +80,7 @@ import org.mockito.kotlin.whenever class BubbleBarLayerViewTest { companion object { - @JvmField @ClassRule - val animatorTestRule: AnimatorTestRule = AnimatorTestRule() + @JvmField @ClassRule val animatorTestRule: AnimatorTestRule = AnimatorTestRule() } private val context = ApplicationProvider.getApplicationContext<Context>() @@ -112,8 +104,8 @@ class BubbleBarLayerViewTest { uiEventLoggerFake = UiEventLoggerFake() val bubbleLogger = BubbleLogger(uiEventLoggerFake) - val mainExecutor = TestExecutor() - val bgExecutor = TestExecutor() + val mainExecutor = TestShellExecutor() + val bgExecutor = TestShellExecutor() val windowManager = context.getSystemService(WindowManager::class.java) @@ -145,24 +137,18 @@ class BubbleBarLayerViewTest { bubbleBarLayerView = BubbleBarLayerView(context, bubbleController, bubbleData, bubbleLogger) - val expandedViewManager = createExpandedViewManager() - val bubbleTaskView = FakeBubbleTaskViewFactory(mainExecutor).create() + val expandedViewManager = FakeBubbleExpandedViewManager(bubbleBar = true, expanded = true) + val bubbleTaskView = FakeBubbleTaskViewFactory(context, mainExecutor).create() val bubbleBarExpandedView = - (LayoutInflater.from(context) - .inflate(R.layout.bubble_bar_expanded_view, null, false /* attachToRoot */) - as BubbleBarExpandedView) - .apply { - initialize( - expandedViewManager, - bubblePositioner, - bubbleLogger, - false /* isOverflow */, - bubbleTaskView, - mainExecutor, - bgExecutor, - null, /* regionSamplingProvider */ - ) - } + FakeBubbleFactory.createExpandedView( + context, + bubblePositioner, + expandedViewManager, + bubbleTaskView, + mainExecutor, + bgExecutor, + bubbleLogger, + ) val viewInfo = FakeBubbleFactory.createViewInfo(bubbleBarExpandedView) bubble = FakeBubbleFactory.createChatBubble(context, viewInfo = viewInfo) @@ -179,8 +165,8 @@ class BubbleBarLayerViewTest { windowManager: WindowManager?, bubbleLogger: BubbleLogger, bubblePositioner: BubblePositioner, - mainExecutor: TestExecutor, - bgExecutor: TestExecutor, + mainExecutor: TestShellExecutor, + bgExecutor: TestShellExecutor, ): BubbleController { val shellInit = ShellInit(mainExecutor) val shellCommandHandler = ShellCommandHandler() @@ -310,74 +296,9 @@ class BubbleBarLayerViewTest { getInstrumentation().waitForIdleSync() getInstrumentation().runOnMainSync { animatorTestRule.advanceTimeBy(200) } PhysicsAnimatorTestUtils.blockUntilAnimationsEnd( - AnimatableScaleMatrix.SCALE_X, AnimatableScaleMatrix.SCALE_Y) - } - - private inner class FakeBubbleTaskViewFactory(private val mainExecutor: ShellExecutor) : - BubbleTaskViewFactory { - override fun create(): BubbleTaskView { - val taskViewTaskController = mock<TaskViewTaskController>() - val taskView = TaskView(context, taskViewTaskController) - val taskInfo = mock<ActivityManager.RunningTaskInfo>() - whenever(taskViewTaskController.taskInfo).thenReturn(taskInfo) - return BubbleTaskView(taskView, mainExecutor) - } - } - - private fun createExpandedViewManager(): BubbleExpandedViewManager { - return object : BubbleExpandedViewManager { - override val overflowBubbles: List<Bubble> - get() = Collections.emptyList() - - override fun setOverflowListener(listener: BubbleData.Listener) {} - - override fun collapseStack() {} - - override fun updateWindowFlagsForBackpress(intercept: Boolean) {} - - override fun promoteBubbleFromOverflow(bubble: Bubble) {} - - override fun removeBubble(key: String, reason: Int) {} - - override fun dismissBubble(bubble: Bubble, reason: Int) {} - - override fun setAppBubbleTaskId(key: String, taskId: Int) {} - - override fun isStackExpanded(): Boolean { - return true - } - - override fun isShowingAsBubbleBar(): Boolean { - return true - } - - override fun hideCurrentInputMethod() {} - - override fun updateBubbleBarLocation(location: BubbleBarLocation, source: Int) {} - } - } - - private class TestExecutor : ShellExecutor { - - private val runnables: MutableList<Runnable> = mutableListOf() - - override fun execute(runnable: Runnable) { - runnables.add(runnable) - } - - override fun executeDelayed(runnable: Runnable, delayMillis: Long) { - execute(runnable) - } - - override fun removeCallbacks(runnable: Runnable?) {} - - override fun hasCallback(runnable: Runnable?): Boolean = false - - fun flushAll() { - while (runnables.isNotEmpty()) { - runnables.removeAt(0).run() - } - } + AnimatableScaleMatrix.SCALE_X, + AnimatableScaleMatrix.SCALE_Y, + ) } private fun View.dispatchTouchEvent(eventTime: Long, action: Int, point: PointF) { diff --git a/libs/WindowManager/Shell/res/values-bs/strings.xml b/libs/WindowManager/Shell/res/values-bs/strings.xml index bb53adf69b29..244149b855f6 100644 --- a/libs/WindowManager/Shell/res/values-bs/strings.xml +++ b/libs/WindowManager/Shell/res/values-bs/strings.xml @@ -87,7 +87,7 @@ <string name="bubble_bar_education_manage_title" msgid="6148404487810835924">"Upravljajte oblačićima u svakom trenutku"</string> <string name="bubble_bar_education_manage_text" msgid="3199732148641842038">"Dodirnite ovdje da upravljate time koje aplikacije i razgovori mogu imati oblačić"</string> <string name="notification_bubble_title" msgid="6082910224488253378">"Oblačić"</string> - <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljaj"</string> + <string name="manage_bubbles_text" msgid="7730624269650594419">"Upravljajte"</string> <string name="accessibility_bubble_dismissed" msgid="8367471990421247357">"Oblačić je odbačen."</string> <string name="bubble_shortcut_label" msgid="666269077944378311">"Oblačići"</string> <string name="bubble_shortcut_long_label" msgid="6088437544312894043">"Prikaz oblačića"</string> diff --git a/libs/WindowManager/Shell/res/values/dimen.xml b/libs/WindowManager/Shell/res/values/dimen.xml index 21ec84d9bc0a..9e2d23b41556 100644 --- a/libs/WindowManager/Shell/res/values/dimen.xml +++ b/libs/WindowManager/Shell/res/values/dimen.xml @@ -266,6 +266,8 @@ <dimen name="bubble_bar_expanded_view_handle_height">4dp</dimen> <!-- Width of the expanded bubble bar view shown when the bubble is expanded. --> <dimen name="bubble_bar_expanded_view_width">412dp</dimen> + <!-- Offset of the expanded view when it starts sliding in as part of the switch animation --> + <dimen name="bubble_bar_expanded_view_switch_offset">48dp</dimen> <!-- Minimum width of the bubble bar manage menu. --> <dimen name="bubble_bar_manage_menu_min_width">200dp</dimen> <!-- Size of the dismiss icon in the bubble bar manage menu. --> diff --git a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/ShellSharedConstants.java b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/ShellSharedConstants.java index 8f7a2e5a6789..01d2201a5a0c 100644 --- a/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/ShellSharedConstants.java +++ b/libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/ShellSharedConstants.java @@ -20,29 +20,6 @@ package com.android.wm.shell.shared; * General shell-related constants that are shared with users of the library. */ public class ShellSharedConstants { - // See IPip.aidl - public static final String KEY_EXTRA_SHELL_PIP = "extra_shell_pip"; - // See IBubbles.aidl - public static final String KEY_EXTRA_SHELL_BUBBLES = "extra_shell_bubbles"; - // See ISplitScreen.aidl - public static final String KEY_EXTRA_SHELL_SPLIT_SCREEN = "extra_shell_split_screen"; - // See IOneHanded.aidl - public static final String KEY_EXTRA_SHELL_ONE_HANDED = "extra_shell_one_handed"; - // See IShellTransitions.aidl - public static final String KEY_EXTRA_SHELL_SHELL_TRANSITIONS = - "extra_shell_shell_transitions"; - // See IStartingWindow.aidl - public static final String KEY_EXTRA_SHELL_STARTING_WINDOW = - "extra_shell_starting_window"; - // See IRecentTasks.aidl - public static final String KEY_EXTRA_SHELL_RECENT_TASKS = "extra_shell_recent_tasks"; - // See IBackAnimation.aidl - public static final String KEY_EXTRA_SHELL_BACK_ANIMATION = "extra_shell_back_animation"; - // See IDesktopMode.aidl - public static final String KEY_EXTRA_SHELL_DESKTOP_MODE = "extra_shell_desktop_mode"; - // See IDragAndDrop.aidl - public static final String KEY_EXTRA_SHELL_DRAG_AND_DROP = "extra_shell_drag_and_drop"; - // See IRecentsAnimationController.aidl public static final String KEY_EXTRA_SHELL_CAN_HAND_OFF_ANIMATION = "extra_shell_can_hand_off_animation"; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index e9cfd9bc2209..c024840498ad 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -32,7 +32,6 @@ import static com.android.window.flags.Flags.migratePredictiveBackTransition; import static com.android.window.flags.Flags.predictiveBackSystemAnims; import static com.android.window.flags.Flags.unifyBackNavigationTransition; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BACK_PREVIEW; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_BACK_ANIMATION; import android.annotation.NonNull; import android.annotation.Nullable; @@ -308,7 +307,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont setupAnimationDeveloperSettingsObserver(mContentResolver, mBgHandler); updateEnableAnimationFromFlags(); createAdapter(); - mShellController.addExternalInterface(KEY_EXTRA_SHELL_BACK_ANIMATION, + mShellController.addExternalInterface(IBackAnimation.DESCRIPTOR, this::createExternalInterface, this); mShellCommandHandler.addDumpCallback(this::dump, this); mShellController.addConfigurationChangeListener(this); @@ -552,6 +551,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont // start animation immediately for non-gestural sources (without ACTION_MOVE // events) mThresholdCrossed = true; + mPointersPilfered = true; onGestureStarted(touchX, touchY, swipeEdge); mShouldStartOnNextMoveEvent = false; } else { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java index 3b53c3fbe03f..bec73a1500a7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java @@ -35,7 +35,6 @@ import static com.android.wm.shell.bubbles.Bubbles.DISMISS_PACKAGE_REMOVED; import static com.android.wm.shell.bubbles.Bubbles.DISMISS_SHORTCUT_REMOVED; import static com.android.wm.shell.bubbles.Bubbles.DISMISS_USER_CHANGED; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_BUBBLES; import android.annotation.BinderThread; import android.annotation.NonNull; @@ -522,7 +521,7 @@ public class BubbleController implements ConfigurationChangeListener, } mShellController.addConfigurationChangeListener(this); - mShellController.addExternalInterface(KEY_EXTRA_SHELL_BUBBLES, + mShellController.addExternalInterface(IBubbles.DESCRIPTOR, this::createExternalInterface, this); mShellCommandHandler.addDumpCallback(this::dump, this); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java index a313bd004a51..4d7c7fad53f8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarAnimationHelper.java @@ -16,6 +16,7 @@ package com.android.wm.shell.bubbles.bar; import static android.view.View.ALPHA; +import static android.view.View.INVISIBLE; import static android.view.View.SCALE_X; import static android.view.View.SCALE_Y; import static android.view.View.TRANSLATION_X; @@ -25,6 +26,7 @@ import static android.view.View.X; import static android.view.View.Y; import static com.android.wm.shell.bubbles.bar.BubbleBarExpandedView.CORNER_RADIUS; +import static com.android.wm.shell.bubbles.bar.BubbleBarExpandedView.TASK_VIEW_ALPHA; import static com.android.wm.shell.shared.animation.Interpolators.EMPHASIZED; import static com.android.wm.shell.shared.animation.Interpolators.EMPHASIZED_DECELERATE; @@ -32,7 +34,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Point; import android.graphics.Rect; @@ -42,11 +43,12 @@ import android.widget.FrameLayout; import androidx.annotation.Nullable; +import com.android.app.animation.Interpolators; +import com.android.wm.shell.R; import com.android.wm.shell.bubbles.BubbleOverflow; import com.android.wm.shell.bubbles.BubblePositioner; import com.android.wm.shell.bubbles.BubbleViewProvider; import com.android.wm.shell.bubbles.animation.AnimatableScaleMatrix; -import com.android.wm.shell.shared.animation.Interpolators; import com.android.wm.shell.shared.animation.PhysicsAnimator; import com.android.wm.shell.shared.magnetictarget.MagnetizedObject.MagneticTarget; @@ -59,7 +61,7 @@ public class BubbleBarAnimationHelper { private static final float EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT = 0.1f; private static final float EXPANDED_VIEW_ANIMATE_OUT_SCALE_AMOUNT = .75f; - private static final int EXPANDED_VIEW_ALPHA_ANIMATION_DURATION = 150; + private static final int EXPANDED_VIEW_EXPAND_ALPHA_DURATION = 150; private static final int EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION = 400; private static final int EXPANDED_VIEW_ANIMATE_TO_REST_DURATION = 400; private static final int EXPANDED_VIEW_DISMISS_DURATION = 250; @@ -72,6 +74,17 @@ public class BubbleBarAnimationHelper { private static final float DISMISS_VIEW_SCALE = 1.25f; private static final int HANDLE_ALPHA_ANIMATION_DURATION = 100; + private static final float SWITCH_OUT_SCALE = 0.97f; + private static final long SWITCH_OUT_SCALE_DURATION = 200L; + private static final long SWITCH_OUT_ALPHA_DURATION = 100L; + private static final long SWITCH_OUT_HANDLE_ALPHA_DURATION = 50L; + private static final long SWITCH_IN_ANIM_DELAY = 50L; + private static final long SWITCH_IN_TX_DURATION = 350L; + private static final long SWITCH_IN_ALPHA_DURATION = 50L; + // Keep this handle alpha delay at least as long as alpha animation for both expanded views. + private static final long SWITCH_IN_HANDLE_ALPHA_DELAY = 150L; + private static final long SWITCH_IN_HANDLE_ALPHA_DURATION = 100L; + /** Spring config for the expanded view scale-in animation. */ private final PhysicsAnimator.SpringConfig mScaleInSpringConfig = new PhysicsAnimator.SpringConfig(300f, 0.9f); @@ -80,68 +93,24 @@ public class BubbleBarAnimationHelper { private final PhysicsAnimator.SpringConfig mScaleOutSpringConfig = new PhysicsAnimator.SpringConfig(900f, 1f); + private final int mSwitchAnimPositionOffset; + /** Matrix used to scale the expanded view container with a given pivot point. */ private final AnimatableScaleMatrix mExpandedViewContainerMatrix = new AnimatableScaleMatrix(); - /** Animator for animating the expanded view's alpha (including the TaskView inside it). */ - private final ValueAnimator mExpandedViewAlphaAnimator = ValueAnimator.ofFloat(0f, 1f); - @Nullable - private Animator mRunningDragAnimator; + private Animator mRunningAnimator; - private final Context mContext; - private final BubbleBarLayerView mLayerView; private final BubblePositioner mPositioner; private final int[] mTmpLocation = new int[2]; + // TODO(b/381936992): remove expanded bubble state from this helper class private BubbleViewProvider mExpandedBubble; - private boolean mIsExpanded = false; - public BubbleBarAnimationHelper(Context context, - BubbleBarLayerView bubbleBarLayerView, - BubblePositioner positioner) { - mContext = context; - mLayerView = bubbleBarLayerView; + public BubbleBarAnimationHelper(Context context, BubblePositioner positioner) { mPositioner = positioner; - - mExpandedViewAlphaAnimator.setDuration(EXPANDED_VIEW_ALPHA_ANIMATION_DURATION); - mExpandedViewAlphaAnimator.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED); - mExpandedViewAlphaAnimator.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationStart(Animator animation) { - BubbleBarExpandedView bbev = getExpandedView(); - if (bbev != null) { - // We need to be Z ordered on top in order for alpha animations to work. - bbev.setSurfaceZOrderedOnTop(true); - bbev.setAnimating(true); - } - } - - @Override - public void onAnimationEnd(Animator animation) { - BubbleBarExpandedView bbev = getExpandedView(); - if (bbev != null) { - // The surface needs to be Z ordered on top for alpha values to work on the - // TaskView, and if we're temporarily hidden, we are still on the screen - // with alpha = 0f until we animate back. Stay Z ordered on top so the alpha - // = 0f remains in effect. - if (mIsExpanded) { - bbev.setSurfaceZOrderedOnTop(false); - } - - bbev.setContentVisibility(mIsExpanded); - bbev.setAnimating(false); - } - } - }); - mExpandedViewAlphaAnimator.addUpdateListener(valueAnimator -> { - BubbleBarExpandedView bbev = getExpandedView(); - if (bbev != null) { - float alpha = (float) valueAnimator.getAnimatedValue(); - bbev.setTaskViewAlpha(alpha); - bbev.setAlpha(alpha); - } - }); + mSwitchAnimPositionOffset = context.getResources().getDimensionPixelSize( + R.dimen.bubble_bar_expanded_view_switch_offset); } /** @@ -154,18 +123,11 @@ public class BubbleBarAnimationHelper { if (bbev == null) { return; } - mIsExpanded = true; mExpandedViewContainerMatrix.setScaleX(0f); mExpandedViewContainerMatrix.setScaleY(0f); - updateExpandedView(); - bbev.setAnimating(true); - bbev.setSurfaceZOrderedOnTop(true); - bbev.setContentVisibility(false); - bbev.setAlpha(0f); - bbev.setTaskViewAlpha(0f); - bbev.setVisibility(VISIBLE); + prepareForAnimateIn(bbev); setScaleFromBubbleBar(mExpandedViewContainerMatrix, 1f - EXPANDED_VIEW_ANIMATE_SCALE_AMOUNT); @@ -173,7 +135,16 @@ public class BubbleBarAnimationHelper { bbev.setAnimationMatrix(mExpandedViewContainerMatrix); bbev.animateExpansionWhenTaskViewVisible(() -> { - mExpandedViewAlphaAnimator.start(); + ObjectAnimator alphaAnim = createAlphaAnimator(bbev, /* visible= */ true); + alphaAnim.setDuration(EXPANDED_VIEW_EXPAND_ALPHA_DURATION); + alphaAnim.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED); + alphaAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + bbev.setAnimating(false); + } + }); + startNewAnimator(alphaAnim); PhysicsAnimator.getInstance(mExpandedViewContainerMatrix).cancel(); PhysicsAnimator.getInstance(mExpandedViewContainerMatrix) @@ -188,7 +159,7 @@ public class BubbleBarAnimationHelper { }) .withEndActions(() -> { bbev.setAnimationMatrix(null); - updateExpandedView(); + updateExpandedView(bbev); if (afterAnimation != null) { afterAnimation.run(); } @@ -197,13 +168,24 @@ public class BubbleBarAnimationHelper { }); } + private void prepareForAnimateIn(BubbleBarExpandedView bbev) { + bbev.setAnimating(true); + updateExpandedView(bbev); + // We need to be Z ordered on top in order for taskView alpha to work. + // It is also set when the alpha animation starts, but needs to be set here to too avoid + // flickers. + bbev.setSurfaceZOrderedOnTop(true); + bbev.setTaskViewAlpha(0f); + bbev.setContentVisibility(false); + bbev.setVisibility(VISIBLE); + } + /** * Collapses the currently expanded bubble. * * @param endRunnable a runnable to run at the end of the animation. */ public void animateCollapse(Runnable endRunnable) { - mIsExpanded = false; final BubbleBarExpandedView bbev = getExpandedView(); if (bbev == null) { Log.w(TAG, "Trying to animate collapse without a bubble"); @@ -214,6 +196,19 @@ public class BubbleBarAnimationHelper { setScaleFromBubbleBar(mExpandedViewContainerMatrix, 1f); + bbev.setAnimating(true); + + ObjectAnimator alphaAnim = createAlphaAnimator(bbev, /* visible= */ false); + alphaAnim.setDuration(EXPANDED_VIEW_EXPAND_ALPHA_DURATION); + alphaAnim.setInterpolator(Interpolators.PANEL_CLOSE_ACCELERATED); + alphaAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + bbev.setAnimating(false); + } + }); + startNewAnimator(alphaAnim); + PhysicsAnimator.getInstance(mExpandedViewContainerMatrix).cancel(); PhysicsAnimator.getInstance(mExpandedViewContainerMatrix) .spring(AnimatableScaleMatrix.SCALE_X, @@ -234,7 +229,6 @@ public class BubbleBarAnimationHelper { } }) .start(); - mExpandedViewAlphaAnimator.reverse(); } private void setScaleFromBubbleBar(AnimatableScaleMatrix matrix, float scale) { @@ -246,6 +240,142 @@ public class BubbleBarAnimationHelper { } /** + * Animate between two bubble views using a switch animation + * + * @param fromBubble bubble to hide + * @param toBubble bubble to show + * @param afterAnimation optional runnable after animation finishes + */ + public void animateSwitch(BubbleViewProvider fromBubble, BubbleViewProvider toBubble, + @Nullable Runnable afterAnimation) { + /* + * Switch animation + * + * |.....................fromBubble scale to 0.97.....................| + * |fromBubble handle alpha 0|....fromBubble alpha to 0.....| | + * 0-------------------------50-----------------------100---150--------200----------250--400 + * |..toBubble alpha to 1...| |toBubble handle alpha 1| | + * |................toBubble position +/-48 to 0...............| + */ + + mExpandedBubble = toBubble; + final BubbleBarExpandedView toBbev = toBubble.getBubbleBarExpandedView(); + final BubbleBarExpandedView fromBbev = fromBubble.getBubbleBarExpandedView(); + if (toBbev == null || fromBbev == null) { + return; + } + + fromBbev.setAnimating(true); + + prepareForAnimateIn(toBbev); + final float endTx = toBbev.getTranslationX(); + final float startTx = getSwitchAnimationInitialTx(endTx); + toBbev.setTranslationX(startTx); + toBbev.getHandleView().setAlpha(0f); + + toBbev.animateExpansionWhenTaskViewVisible(() -> { + AnimatorSet switchAnim = new AnimatorSet(); + switchAnim.playTogether(switchOutAnimator(fromBbev), switchInAnimator(toBbev, endTx)); + + switchAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + if (afterAnimation != null) { + afterAnimation.run(); + } + } + }); + startNewAnimator(switchAnim); + }); + } + + private float getSwitchAnimationInitialTx(float endTx) { + if (mPositioner.isBubbleBarOnLeft()) { + return endTx - mSwitchAnimPositionOffset; + } else { + return endTx + mSwitchAnimPositionOffset; + } + } + + private Animator switchOutAnimator(BubbleBarExpandedView bbev) { + setPivotToCenter(bbev); + AnimatorSet scaleAnim = new AnimatorSet(); + scaleAnim.playTogether( + ObjectAnimator.ofFloat(bbev, SCALE_X, SWITCH_OUT_SCALE), + ObjectAnimator.ofFloat(bbev, SCALE_Y, SWITCH_OUT_SCALE) + ); + scaleAnim.setInterpolator(Interpolators.ACCELERATE); + scaleAnim.setDuration(SWITCH_OUT_SCALE_DURATION); + + ObjectAnimator alphaAnim = createAlphaAnimator(bbev, /* visible= */ false); + alphaAnim.setStartDelay(SWITCH_OUT_HANDLE_ALPHA_DURATION); + alphaAnim.setDuration(SWITCH_OUT_ALPHA_DURATION); + + ObjectAnimator handleAlphaAnim = ObjectAnimator.ofFloat(bbev.getHandleView(), ALPHA, 0f) + .setDuration(SWITCH_OUT_HANDLE_ALPHA_DURATION); + + AnimatorSet animator = new AnimatorSet(); + animator.playTogether(scaleAnim, alphaAnim, handleAlphaAnim); + + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + bbev.setAnimating(false); + } + }); + return animator; + } + + private Animator switchInAnimator(BubbleBarExpandedView bbev, float restingTx) { + ObjectAnimator positionAnim = ObjectAnimator.ofFloat(bbev, TRANSLATION_X, restingTx); + positionAnim.setInterpolator(Interpolators.EMPHASIZED_DECELERATE); + positionAnim.setStartDelay(SWITCH_IN_ANIM_DELAY); + positionAnim.setDuration(SWITCH_IN_TX_DURATION); + + // Animate alpha directly to have finer control over surface z-ordering + ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(bbev, TASK_VIEW_ALPHA, 1f); + alphaAnim.setStartDelay(SWITCH_IN_ANIM_DELAY); + alphaAnim.setDuration(SWITCH_IN_ALPHA_DURATION); + alphaAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + bbev.setSurfaceZOrderedOnTop(true); + } + + @Override + public void onAnimationEnd(Animator animation) { + bbev.setContentVisibility(true); + // The outgoing expanded view alpha animation is still in progress. + // Do not reset the surface z-order as otherwise the outgoing expanded view is + // placed on top. + } + }); + + ObjectAnimator handleAlphaAnim = ObjectAnimator.ofFloat(bbev.getHandleView(), ALPHA, 1f); + handleAlphaAnim.setStartDelay(SWITCH_IN_HANDLE_ALPHA_DELAY); + handleAlphaAnim.setDuration(SWITCH_IN_HANDLE_ALPHA_DURATION); + handleAlphaAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + bbev.setSurfaceZOrderedOnTop(false); + bbev.setAnimating(false); + } + }); + + AnimatorSet animator = new AnimatorSet(); + animator.playTogether(positionAnim, alphaAnim, handleAlphaAnim); + + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + updateExpandedView(bbev); + } + }); + return animator; + } + + + /** * Animate the expanded bubble when it is being dragged */ public void animateStartDrag() { @@ -273,7 +403,7 @@ public class BubbleBarAnimationHelper { AnimatorSet animatorSet = new AnimatorSet(); animatorSet.playTogether(contentAnim, handleAnim); animatorSet.addListener(new DragAnimatorListenerAdapter(bbev)); - startNewDragAnimation(animatorSet); + startNewAnimator(animatorSet); } /** @@ -282,7 +412,6 @@ public class BubbleBarAnimationHelper { * @param endRunnable a runnable to run at the end of the animation */ public void animateDismiss(Runnable endRunnable) { - mIsExpanded = false; final BubbleBarExpandedView bbev = getExpandedView(); if (bbev == null) { Log.w(TAG, "Trying to animate dismiss without a bubble"); @@ -335,7 +464,7 @@ public class BubbleBarAnimationHelper { bbev.setDragging(false); } }); - startNewDragAnimation(animatorSet); + startNewAnimator(animatorSet); } /** @@ -409,7 +538,7 @@ public class BubbleBarAnimationHelper { } } }); - startNewDragAnimation(animatorSet); + startNewAnimator(animatorSet); } /** @@ -435,7 +564,7 @@ public class BubbleBarAnimationHelper { animatorSet.setDuration(EXPANDED_VIEW_SNAP_TO_DISMISS_DURATION).setInterpolator( EMPHASIZED_DECELERATE); animatorSet.addListener(new DragAnimatorListenerAdapter(bbev)); - startNewDragAnimation(animatorSet); + startNewAnimator(animatorSet); } /** @@ -443,14 +572,15 @@ public class BubbleBarAnimationHelper { */ public void cancelAnimations() { PhysicsAnimator.getInstance(mExpandedViewContainerMatrix).cancel(); - mExpandedViewAlphaAnimator.cancel(); BubbleBarExpandedView bbev = getExpandedView(); if (bbev != null) { bbev.animate().cancel(); } - if (mRunningDragAnimator != null) { - mRunningDragAnimator.cancel(); - mRunningDragAnimator = null; + if (mRunningAnimator != null) { + if (mRunningAnimator.isRunning()) { + mRunningAnimator.cancel(); + } + mRunningAnimator = null; } } @@ -462,8 +592,7 @@ public class BubbleBarAnimationHelper { return null; } - private void updateExpandedView() { - BubbleBarExpandedView bbev = getExpandedView(); + private void updateExpandedView(BubbleBarExpandedView bbev) { if (bbev == null) { Log.w(TAG, "Trying to update the expanded view without a bubble"); return; @@ -477,6 +606,8 @@ public class BubbleBarAnimationHelper { bbev.setLayoutParams(lp); bbev.setX(position.x); bbev.setY(position.y); + bbev.setScaleX(1f); + bbev.setScaleY(1f); bbev.updateLocation(); bbev.maybeShowOverflow(); } @@ -500,18 +631,54 @@ public class BubbleBarAnimationHelper { return new Size(width, height); } - private void startNewDragAnimation(Animator animator) { + private void startNewAnimator(Animator animator) { cancelAnimations(); - mRunningDragAnimator = animator; + mRunningAnimator = animator; animator.start(); } + /** + * Animate the alpha of the expanded view between visible (1) and invisible (0). + * {@link BubbleBarExpandedView} requires + * {@link com.android.wm.shell.bubbles.BubbleExpandedView#setSurfaceZOrderedOnTop(boolean)} to + * be called before alpha can be applied. + * Only supports alpha of 1 or 0. Otherwise we can't reset surface z-order at the end. + */ + private ObjectAnimator createAlphaAnimator(BubbleBarExpandedView bubbleBarExpandedView, + boolean visible) { + ObjectAnimator animator = ObjectAnimator.ofFloat(bubbleBarExpandedView, TASK_VIEW_ALPHA, + visible ? 1f : 0f); + animator.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + // Move task view to the top of the window so alpha can be applied to it + bubbleBarExpandedView.setSurfaceZOrderedOnTop(true); + } + + @Override + public void onAnimationEnd(Animator animation) { + bubbleBarExpandedView.setContentVisibility(visible); + if (!visible) { + // Hide the expanded view before we reset the z-ordering + bubbleBarExpandedView.setVisibility(INVISIBLE); + } + bubbleBarExpandedView.setSurfaceZOrderedOnTop(false); + } + }); + return animator; + } + private static void setDragPivot(BubbleBarExpandedView bbev) { bbev.setPivotX(bbev.getWidth() / 2f); bbev.setPivotY(0f); } - private class DragAnimatorListenerAdapter extends AnimatorListenerAdapter { + private static void setPivotToCenter(BubbleBarExpandedView bbev) { + bbev.setPivotX(bbev.getWidth() / 2f); + bbev.setPivotY(bbev.getHeight() / 2f); + } + + private static class DragAnimatorListenerAdapter extends AnimatorListenerAdapter { private final BubbleBarExpandedView mBubbleBarExpandedView; @@ -523,11 +690,9 @@ public class BubbleBarAnimationHelper { public void onAnimationStart(Animator animation) { mBubbleBarExpandedView.setAnimating(true); } - @Override public void onAnimationEnd(Animator animation) { mBubbleBarExpandedView.setAnimating(false); - mRunningDragAnimator = null; } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java index ed49417ad3bd..2c0483c50710 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarExpandedView.java @@ -85,6 +85,22 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView } }; + /** + * Property to set alpha for the task view + */ + public static final FloatProperty<BubbleBarExpandedView> TASK_VIEW_ALPHA = new FloatProperty<>( + "taskViewAlpha") { + @Override + public void setValue(BubbleBarExpandedView bbev, float alpha) { + bbev.setTaskViewAlpha(alpha); + } + + @Override + public Float get(BubbleBarExpandedView bbev) { + return bbev.mTaskView != null ? bbev.mTaskView.getAlpha() : bbev.getAlpha(); + } + }; + private static final String TAG = BubbleBarExpandedView.class.getSimpleName(); private static final int INVALID_TASK_ID = -1; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java index 0c05e3c5115c..425afbed0742 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/bar/BubbleBarLayerView.java @@ -103,8 +103,7 @@ public class BubbleBarLayerView extends FrameLayout mPositioner = mBubbleController.getPositioner(); mBubbleLogger = bubbleLogger; - mAnimationHelper = new BubbleBarAnimationHelper(context, - this, mPositioner); + mAnimationHelper = new BubbleBarAnimationHelper(context, mPositioner); mEducationViewController = new BubbleEducationViewController(context, (boolean visible) -> { if (mExpandedView == null) return; mExpandedView.setObscured(visible); @@ -183,8 +182,14 @@ public class BubbleBarLayerView extends FrameLayout // Already showing this bubble, skip animating return; } + BubbleViewProvider previousBubble = null; if (mExpandedBubble != null && !b.getKey().equals(mExpandedBubble.getKey())) { - removeView(mExpandedView); + if (mIsExpanded) { + // Previous expanded view open, keep it visible to animate the switch + previousBubble = mExpandedBubble; + } else { + removeView(mExpandedView); + } mExpandedView = null; } if (mExpandedView == null) { @@ -246,7 +251,8 @@ public class BubbleBarLayerView extends FrameLayout mIsExpanded = true; mBubbleController.getSysuiProxy().onStackExpandChanged(true); - mAnimationHelper.animateExpansion(mExpandedBubble, () -> { + + final Runnable afterAnimation = () -> { if (mExpandedView == null) return; // Touch delegate for the menu BubbleBarHandleView view = mExpandedView.getHandleView(); @@ -256,7 +262,18 @@ public class BubbleBarLayerView extends FrameLayout mHandleTouchDelegate = new TouchDelegate(mHandleTouchBounds, mExpandedView.getHandleView()); setTouchDelegate(mHandleTouchDelegate); - }); + }; + + if (previousBubble != null) { + final BubbleBarExpandedView previousExpandedView = + previousBubble.getBubbleBarExpandedView(); + mAnimationHelper.animateSwitch(previousBubble, mExpandedBubble, () -> { + removeView(previousExpandedView); + afterAnimation.run(); + }); + } else { + mAnimationHelper.animateExpansion(mExpandedBubble, afterAnimation); + } showScrim(true); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxConfiguration.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxConfiguration.kt index 83a8e3103e3f..244ff99cadd0 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxConfiguration.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxConfiguration.kt @@ -36,6 +36,21 @@ class LetterboxConfiguration @Inject constructor( // Color resource id for the solid color letterbox background type. private var letterboxBackgroundColorResourceIdOverride: Int? = null + // Default value for corners radius for activities presented in the letterbox mode. + // Values < 0 will be ignored. + private val letterboxActivityDefaultCornersRadius: Int + + // Current corners radius for activities presented in the letterbox mode. + // Values can be modified at runtime and values < 0 will be ignored. + private var letterboxActivityCornersRadius = 0 + + init { + letterboxActivityDefaultCornersRadius = context.resources.getInteger( + R.integer.config_letterboxActivityCornersRadius + ) + letterboxActivityCornersRadius = letterboxActivityDefaultCornersRadius + } + /** * Sets color of letterbox background which is used when using the solid background mode. */ @@ -64,7 +79,7 @@ class LetterboxConfiguration @Inject constructor( } // Query color dynamically because material colors extracted from wallpaper are updated // when wallpaper is changed. - return Color.valueOf(context.getResources().getColor(colorId!!, /* theme */null)) + return Color.valueOf(context.getResources().getColor(colorId!!, null)) } /** @@ -79,4 +94,33 @@ class LetterboxConfiguration @Inject constructor( * The background color for the Letterbox. */ fun getBackgroundColorRgbArray(): FloatArray = getLetterboxBackgroundColor().components + + /** + * Overrides corners radius for activities presented in the letterbox mode. Values < 0, + * will be ignored and corners of the activity won't be rounded. + */ + fun setLetterboxActivityCornersRadius(cornersRadius: Int) { + letterboxActivityCornersRadius = cornersRadius + } + + /** + * Resets corners radius for activities presented in the letterbox mode. + */ + fun resetLetterboxActivityCornersRadius() { + letterboxActivityCornersRadius = letterboxActivityDefaultCornersRadius + } + + /** + * Whether corners of letterboxed activities are rounded. + */ + fun isLetterboxActivityCornersRounded(): Boolean { + return getLetterboxActivityCornersRadius() > 0 + } + + /** + * Gets corners radius for activities presented in the letterbox mode. + */ + fun getLetterboxActivityCornersRadius(): Int { + return maxOf(letterboxActivityCornersRadius, 0) + } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxControllerStrategy.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxControllerStrategy.kt new file mode 100644 index 000000000000..9e3edf68ed03 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxControllerStrategy.kt @@ -0,0 +1,52 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.letterbox + +import com.android.wm.shell.dagger.WMSingleton +import javax.inject.Inject + +/** + * Encapsulate the logic related to the use of a single or multiple surfaces when + * implementing letterbox in shell. + */ +@WMSingleton +class LetterboxControllerStrategy @Inject constructor() { + + // Different letterbox implementation modes. + enum class LetterboxMode { SINGLE_SURFACE, MULTIPLE_SURFACES } + + @Volatile + private var currentMode: LetterboxMode = LetterboxMode.SINGLE_SURFACE + + fun configureLetterboxMode() { + // TODO(b/377875146): Define criteria for switching between [LetterboxMode]s. + currentMode = if (android.os.SystemProperties.getInt( + "multi_interface", + 0 + ) == 0 + ) { + LetterboxMode.SINGLE_SURFACE + } else { + LetterboxMode.MULTIPLE_SURFACES + } + } + + /** + * @return The specific mode to use for implementing letterboxing for the given [request]. + */ + fun getLetterboxImplementationMode(): LetterboxMode = currentMode +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt index a48dc8be0d1c..47180718634c 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserver.kt @@ -35,7 +35,8 @@ class LetterboxTransitionObserver( shellInit: ShellInit, private val transitions: Transitions, private val letterboxController: LetterboxController, - private val transitionStateHolder: TransitionStateHolder + private val transitionStateHolder: TransitionStateHolder, + private val letterboxModeStrategy: LetterboxControllerStrategy ) : Transitions.TransitionObserver { companion object { @@ -63,7 +64,6 @@ class LetterboxTransitionObserver( // We recognise the operation to execute and delegate to the LetterboxController // the related operation. // TODO(b/377875151): Identify Desktop Windowing Transactions. - // TODO(b/377857898): Handling multiple surfaces // TODO(b/371500295): Handle input events detection. for (change in info.changes) { change.taskInfo?.let { ti -> @@ -83,6 +83,7 @@ class LetterboxTransitionObserver( } else { val isTopActivityLetterboxed = ti.appCompatTaskInfo.isTopActivityLetterboxed if (isTopActivityLetterboxed) { + letterboxModeStrategy.configureLetterboxMode() createLetterboxSurface( key, startTransaction, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxUtils.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxUtils.kt new file mode 100644 index 000000000000..ef964f40dab3 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/LetterboxUtils.kt @@ -0,0 +1,68 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.letterbox + +import android.graphics.Rect +import android.view.SurfaceControl +import android.view.SurfaceControl.Transaction + +/** + * Creates a [LetterboxController] which is the composition of other two [LetterboxController]. + * It basically invokes the method on both of them. + */ +infix fun LetterboxController.append(other: LetterboxController) = object : LetterboxController { + override fun createLetterboxSurface( + key: LetterboxKey, + transaction: Transaction, + parentLeash: SurfaceControl + ) { + this@append.createLetterboxSurface(key, transaction, parentLeash) + other.createLetterboxSurface(key, transaction, parentLeash) + } + + override fun destroyLetterboxSurface( + key: LetterboxKey, + transaction: Transaction + ) { + this@append.destroyLetterboxSurface(key, transaction) + other.destroyLetterboxSurface(key, transaction) + } + + override fun updateLetterboxSurfaceVisibility( + key: LetterboxKey, + transaction: Transaction, + visible: Boolean + ) { + this@append.updateLetterboxSurfaceVisibility(key, transaction, visible) + other.updateLetterboxSurfaceVisibility(key, transaction, visible) + } + + override fun updateLetterboxSurfaceBounds( + key: LetterboxKey, + transaction: Transaction, + taskBounds: Rect, + activityBounds: Rect + ) { + this@append.updateLetterboxSurfaceBounds(key, transaction, taskBounds, activityBounds) + other.updateLetterboxSurfaceBounds(key, transaction, taskBounds, activityBounds) + } + + override fun dump() { + this@append.dump() + other.dump() + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/MixedLetterboxController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/MixedLetterboxController.kt new file mode 100644 index 000000000000..8d065703c380 --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/MixedLetterboxController.kt @@ -0,0 +1,54 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.letterbox + +import android.view.SurfaceControl +import android.view.SurfaceControl.Transaction +import com.android.wm.shell.compatui.letterbox.LetterboxControllerStrategy.LetterboxMode.MULTIPLE_SURFACES +import com.android.wm.shell.compatui.letterbox.LetterboxControllerStrategy.LetterboxMode.SINGLE_SURFACE +import com.android.wm.shell.dagger.WMSingleton +import javax.inject.Inject + +/** + * [LetterboxController] implementation working as coordinator of other [LetterboxController] + * implementations. + */ +@WMSingleton +class MixedLetterboxController @Inject constructor( + private val singleSurfaceController: SingleSurfaceLetterboxController, + private val multipleSurfaceController: MultiSurfaceLetterboxController, + private val controllerStrategy: LetterboxControllerStrategy +) : LetterboxController by singleSurfaceController append multipleSurfaceController { + + override fun createLetterboxSurface( + key: LetterboxKey, + transaction: Transaction, + parentLeash: SurfaceControl + ) { + when (controllerStrategy.getLetterboxImplementationMode()) { + SINGLE_SURFACE -> { + multipleSurfaceController.destroyLetterboxSurface(key, transaction) + singleSurfaceController.createLetterboxSurface(key, transaction, parentLeash) + } + + MULTIPLE_SURFACES -> { + singleSurfaceController.destroyLetterboxSurface(key, transaction) + multipleSurfaceController.createLetterboxSurface(key, transaction, parentLeash) + } + } + } +} diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/LetterboxModule.java b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/LetterboxModule.java new file mode 100644 index 000000000000..76279ec8cfec --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/dagger/LetterboxModule.java @@ -0,0 +1,56 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.dagger; + +import android.annotation.NonNull; + +import com.android.wm.shell.common.transition.TransitionStateHolder; +import com.android.wm.shell.compatui.letterbox.LetterboxController; +import com.android.wm.shell.compatui.letterbox.LetterboxControllerStrategy; +import com.android.wm.shell.compatui.letterbox.LetterboxTransitionObserver; +import com.android.wm.shell.compatui.letterbox.MixedLetterboxController; +import com.android.wm.shell.sysui.ShellInit; +import com.android.wm.shell.transition.Transitions; + +import dagger.Binds; +import dagger.Module; +import dagger.Provides; + +/** + * Provides Letterbox Shell implementation components to Dagger dependency Graph. + */ +@Module +public abstract class LetterboxModule { + + @WMSingleton + @Provides + static LetterboxTransitionObserver provideLetterboxTransitionObserver( + @NonNull ShellInit shellInit, + @NonNull Transitions transitions, + @NonNull LetterboxController letterboxController, + @NonNull TransitionStateHolder transitionStateHolder, + @NonNull LetterboxControllerStrategy letterboxControllerStrategy + ) { + return new LetterboxTransitionObserver(shellInit, transitions, letterboxController, + transitionStateHolder, letterboxControllerStrategy); + } + + @WMSingleton + @Binds + abstract LetterboxController bindsLetterboxController( + MixedLetterboxController letterboxController); +} 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 df2b849019a4..86e0d08ba05a 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 @@ -71,11 +71,8 @@ import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.common.TaskStackListenerImpl; import com.android.wm.shell.common.split.SplitState; -import com.android.wm.shell.common.transition.TransitionStateHolder; import com.android.wm.shell.compatui.letterbox.LetterboxCommandHandler; -import com.android.wm.shell.compatui.letterbox.LetterboxController; import com.android.wm.shell.compatui.letterbox.LetterboxTransitionObserver; -import com.android.wm.shell.compatui.letterbox.SingleSurfaceLetterboxController; import com.android.wm.shell.dagger.back.ShellBackAnimationModule; import com.android.wm.shell.dagger.pip.PipModule; import com.android.wm.shell.desktopmode.CloseDesktopTaskTransitionHandler; @@ -155,6 +152,7 @@ import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel; import com.android.wm.shell.windowdecor.WindowDecorViewModel; import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystemViewContainer; import com.android.wm.shell.windowdecor.common.viewhost.DefaultWindowDecorViewHostSupplier; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost; import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier; import com.android.wm.shell.windowdecor.education.DesktopWindowingEducationPromoController; import com.android.wm.shell.windowdecor.education.DesktopWindowingEducationTooltipController; @@ -181,7 +179,8 @@ import java.util.Optional; * <p>This module only defines Shell dependencies for handheld SystemUI implementation. Common * dependencies should go into {@link WMShellBaseModule}. */ -@Module(includes = {WMShellBaseModule.class, PipModule.class, ShellBackAnimationModule.class}) +@Module(includes = {WMShellBaseModule.class, PipModule.class, ShellBackAnimationModule.class, + LetterboxModule.class}) public abstract class WMShellModule { // @@ -303,6 +302,7 @@ public abstract class WMShellModule { Transitions transitions, RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer, FocusTransitionObserver focusTransitionObserver, + WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier, Optional<DesktopModeWindowDecorViewModel> desktopModeWindowDecorViewModel) { if (desktopModeWindowDecorViewModel.isPresent()) { return desktopModeWindowDecorViewModel.get(); @@ -320,7 +320,8 @@ public abstract class WMShellModule { rootTaskDisplayAreaOrganizer, syncQueue, transitions, - focusTransitionObserver); + focusTransitionObserver, + windowDecorViewHostSupplier); } @WMSingleton @@ -345,7 +346,7 @@ public abstract class WMShellModule { @WMSingleton @Provides - static WindowDecorViewHostSupplier provideWindowDecorViewHostSupplier( + static WindowDecorViewHostSupplier<WindowDecorViewHost> provideWindowDecorViewHostSupplier( @ShellMainThread @NonNull CoroutineScope mainScope) { return new DefaultWindowDecorViewHostSupplier(mainScope); } @@ -910,6 +911,7 @@ public abstract class WMShellModule { InteractionJankMonitor interactionJankMonitor, AppToWebGenericLinksParser genericLinksParser, AssistContentRequester assistContentRequester, + WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier, MultiInstanceHelper multiInstanceHelper, Optional<DesktopTasksLimiter> desktopTasksLimiter, AppHandleEducationController appHandleEducationController, @@ -929,8 +931,8 @@ public abstract class WMShellModule { displayInsetsController, syncQueue, transitions, desktopTasksController, desktopImmersiveController.get(), rootTaskDisplayAreaOrganizer, interactionJankMonitor, genericLinksParser, - assistContentRequester, multiInstanceHelper, desktopTasksLimiter, - appHandleEducationController, appToWebEducationController, + assistContentRequester, windowDecorViewHostSupplier, multiInstanceHelper, + desktopTasksLimiter, appHandleEducationController, appToWebEducationController, windowDecorCaptionHandleRepository, activityOrientationChangeHandler, focusTransitionObserver, desktopModeEventLogger, desktopModeUiEventLogger)); } @@ -1328,24 +1330,4 @@ public abstract class WMShellModule { return new Object(); } - // - // App Compat - // - - @WMSingleton - @Provides - static LetterboxTransitionObserver provideLetterboxTransitionObserver( - @NonNull ShellInit shellInit, - @NonNull Transitions transitions, - @NonNull LetterboxController letterboxController, - @NonNull TransitionStateHolder transitionStateHolder - ) { - return new LetterboxTransitionObserver(shellInit, transitions, letterboxController, - transitionStateHolder); - } - - @WMSingleton - @Binds - abstract LetterboxController bindsLetterboxController( - SingleSurfaceLetterboxController letterboxController); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandler.kt index 71318cf8f42d..1ddb834399cb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandler.kt @@ -65,7 +65,9 @@ class DesktopModeKeyGestureHandler( KeyGestureEvent.KEY_GESTURE_TYPE_MOVE_TO_NEXT_DISPLAY -> { logV("Key gesture MOVE_TO_NEXT_DISPLAY is handled") getGloballyFocusedFreeformTask()?.let { - desktopTasksController.get().moveToNextDisplay(it.taskId) + mainExecutor.execute { + desktopTasksController.get().moveToNextDisplay(it.taskId) + } } return true } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopRepository.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopRepository.kt index e187d2c3f895..bccb609c41e8 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopRepository.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopRepository.kt @@ -333,7 +333,9 @@ class DesktopRepository( */ private fun addOrMoveFreeformTaskToTop(displayId: Int, taskId: Int) { logD("Add or move task to top: display=%d taskId=%d", taskId, displayId) - desktopTaskDataByDisplayId[displayId]?.freeformTasksInZOrder?.remove(taskId) + desktopTaskDataByDisplayId.forEach { _, value -> + value.freeformTasksInZOrder.remove(taskId) + } desktopTaskDataByDisplayId.getOrCreate(displayId).freeformTasksInZOrder.add(0, taskId) // Unminimize the task if it is minimized. unminimizeTask(displayId, taskId) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt index c16c805ce28e..d5a2a4083b1d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt @@ -67,7 +67,6 @@ import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_HOLD import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_ENTER_APP_HANDLE_DRAG_RELEASE import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_SNAP_RESIZE import com.android.internal.jank.InteractionJankMonitor -import com.android.internal.policy.ScreenDecorationsUtils import com.android.internal.protolog.ProtoLog import com.android.window.flags.Flags import com.android.wm.shell.Flags.enableFlexibleSplit @@ -104,7 +103,6 @@ import com.android.wm.shell.recents.RecentsTransitionHandler import com.android.wm.shell.recents.RecentsTransitionStateListener import com.android.wm.shell.recents.RecentsTransitionStateListener.RecentsTransitionState import com.android.wm.shell.recents.RecentsTransitionStateListener.TRANSITION_STATE_NOT_RUNNING -import com.android.wm.shell.shared.ShellSharedConstants import com.android.wm.shell.shared.TransitionUtil import com.android.wm.shell.shared.annotations.ExternalThread import com.android.wm.shell.shared.annotations.ShellMainThread @@ -237,7 +235,7 @@ class DesktopTasksController( shellCommandHandler.addDumpCallback(this::dump, this) shellCommandHandler.addCommandCallback("desktopmode", desktopModeShellCommandHandler, this) shellController.addExternalInterface( - ShellSharedConstants.KEY_EXTRA_SHELL_DESKTOP_MODE, + IDesktopMode.DESCRIPTOR, { createExternalInterface() }, this, ) @@ -1484,7 +1482,10 @@ class DesktopTasksController( if (!DesktopModeStatus.useRoundedCorners()) { return } - val cornerRadius = ScreenDecorationsUtils.getWindowCornerRadius(context) + val cornerRadius = + context.resources + .getDimensionPixelSize(R.dimen.desktop_windowing_freeform_rounded_corner_radius) + .toFloat() info.changes .filter { it.taskInfo?.windowingMode == WINDOWING_MODE_FREEFORM } .forEach { finishTransaction.setCornerRadius(it.leash, cornerRadius) } @@ -1509,28 +1510,20 @@ class DesktopTasksController( /** Open an existing instance of an app. */ fun openInstance(callingTask: RunningTaskInfo, requestedTaskId: Int) { - val wct = WindowContainerTransaction() - val options = createNewWindowOptions(callingTask) - if (options.launchWindowingMode == WINDOWING_MODE_FREEFORM) { - wct.startTask(requestedTaskId, options.toBundle()) - val taskIdToMinimize = - bringDesktopAppsToFrontBeforeShowingNewTask( - callingTask.displayId, - wct, + if (callingTask.isFreeform) { + val requestedTaskInfo = shellTaskOrganizer.getRunningTaskInfo(requestedTaskId) + if (requestedTaskInfo?.isFreeform == true) { + // If requested task is an already open freeform task, just move it to front. + moveTaskToFront(requestedTaskId) + } else { + moveBackgroundTaskToDesktop( requestedTaskId, + WindowContainerTransaction(), + DesktopModeTransitionSource.APP_HANDLE_MENU_BUTTON, ) - val exitResult = - desktopImmersiveController.exitImmersiveIfApplicable( - wct = wct, - displayId = callingTask.displayId, - excludeTaskId = requestedTaskId, - reason = DesktopImmersiveController.ExitReason.TASK_LAUNCH, - ) - val transition = transitions.startTransition(TRANSIT_OPEN, wct, null) - taskIdToMinimize?.let { addPendingMinimizeTransition(transition, it) } - addPendingAppLaunchTransition(transition, requestedTaskId, taskIdToMinimize) - exitResult.asExit()?.runOnTransitionStart?.invoke(transition) + } } else { + val options = createNewWindowOptions(callingTask) val splitPosition = splitScreenController.determineNewInstancePosition(callingTask) splitScreenController.startTask( requestedTaskId, diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt index 11110f19e6d6..d23c9d0b8ffd 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DragToDesktopTransitionHandler.kt @@ -19,7 +19,6 @@ import android.content.Intent import android.content.Intent.FILL_IN_COMPONENT import android.graphics.PointF import android.graphics.Rect -import android.os.Bundle import android.os.IBinder import android.os.SystemClock import android.os.SystemProperties @@ -139,7 +138,11 @@ sealed class DragToDesktopTransitionHandler( taskUser, ) val wct = WindowContainerTransaction() - wct.sendPendingIntent(pendingIntent, launchHomeIntent, Bundle()) + // The app that is being dragged into desktop mode might cause new transitions, make this + // launch transient to make sure those transitions can execute in parallel and thus won't + // block the end-drag transition. + val intentOptions = ActivityOptions.makeBasic().setTransientLaunch() + wct.sendPendingIntent(pendingIntent, launchHomeIntent, intentOptions.toBundle()) val startTransitionToken = transitions.startTransition(TRANSIT_DESKTOP_MODE_START_DRAG_TO_DESKTOP, wct, this) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java index 22e8dc186e9b..491b577386d7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragAndDropController.java @@ -31,8 +31,6 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMA import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_DRAG_AND_DROP; - import android.app.ActivityManager; import android.app.ActivityTaskManager; import android.app.PendingIntent; @@ -167,7 +165,7 @@ public class DragAndDropController implements RemoteCallable<DragAndDropControll mMainExecutor.executeDelayed(() -> { mDisplayController.addDisplayWindowListener(this); }, 0); - mShellController.addExternalInterface(KEY_EXTRA_SHELL_DRAG_AND_DROP, + mShellController.addExternalInterface(IDragAndDrop.DESCRIPTOR, this::createExternalInterface, this); mShellTaskOrganizer.addTaskVanishedListener(this); mShellCommandHandler.addDumpCallback(this::dump, this); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java index 15472ebc149b..862520208d23 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/onehanded/OneHandedController.java @@ -23,7 +23,6 @@ import static com.android.wm.shell.onehanded.OneHandedState.STATE_ACTIVE; import static com.android.wm.shell.onehanded.OneHandedState.STATE_ENTERING; import static com.android.wm.shell.onehanded.OneHandedState.STATE_EXITING; import static com.android.wm.shell.onehanded.OneHandedState.STATE_NONE; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_ONE_HANDED; import android.annotation.BinderThread; import android.content.ComponentName; @@ -298,7 +297,7 @@ public class OneHandedController implements RemoteCallable<OneHandedController>, mShellController.addConfigurationChangeListener(this); mShellController.addKeyguardChangeListener(this); mShellController.addUserChangeListener(this); - mShellController.addExternalInterface(KEY_EXTRA_SHELL_ONE_HANDED, + mShellController.addExternalInterface(IOneHanded.DESCRIPTOR, this::createExternalInterface, this); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/performance/PerfHintController.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/performance/PerfHintController.kt index f7977f88006e..c655d86c3ece 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/performance/PerfHintController.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/performance/PerfHintController.kt @@ -45,9 +45,15 @@ class PerfHintController(private val mContext: Context, private fun onInit() { mShellCommandHandler.addDumpCallback(this::dump, this) val perfHintMgr = mContext.getSystemService(PerformanceHintManager::class.java) - val adpfSession = perfHintMgr!!.createHintSession(intArrayOf(Process.myTid()), - TimeUnit.SECONDS.toNanos(1)) - hinter.setAdpfSession(adpfSession) + if (perfHintMgr != null) { + val adpfSession = perfHintMgr.createHintSession( + intArrayOf(Process.myTid()), + TimeUnit.SECONDS.toNanos(1) + ) + if (adpfSession != null) { + hinter.setAdpfSession(adpfSession) + } + } } fun dump(pw: PrintWriter, prefix: String?) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java index 6129651dc271..6e7740dc13e3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransitionController.java @@ -39,6 +39,7 @@ import android.view.SurfaceControl; import android.view.WindowManager; import android.window.TransitionInfo; import android.window.TransitionRequestInfo; +import android.window.WindowContainerToken; import android.window.WindowContainerTransaction; import androidx.annotation.NonNull; @@ -312,6 +313,23 @@ public abstract class PipTransitionController implements Transitions.TransitionH return false; } + /** + * @return a change representing a config-at-end activity for a given parent. + */ + @Nullable + public TransitionInfo.Change getDeferConfigActivityChange(TransitionInfo info, + @android.annotation.NonNull WindowContainerToken parent) { + for (TransitionInfo.Change change : info.getChanges()) { + if (change.getTaskInfo() == null + && change.hasFlags(TransitionInfo.FLAG_CONFIG_AT_END) + && change.getParent() != null && change.getParent().equals(parent)) { + return change; + } + } + return null; + } + + /** Whether a particular package is same as current pip package. */ public boolean isPackageActiveInPip(@Nullable String packageName) { // No-op, to be handled differently in PIP1 and PIP2 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 588b88753eb9..582df486b2b3 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 @@ -32,7 +32,6 @@ import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTI import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_TO_PIP; import static com.android.wm.shell.pip.PipAnimationController.TRANSITION_DIRECTION_USER_RESIZE; import static com.android.wm.shell.pip.PipAnimationController.isOutPipDirection; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_PIP; import android.app.ActivityManager; import android.app.ActivityTaskManager; @@ -727,7 +726,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb mShellController.addConfigurationChangeListener(this); mShellController.addKeyguardChangeListener(this); mShellController.addUserChangeListener(this); - mShellController.addExternalInterface(KEY_EXTRA_SHELL_PIP, + mShellController.addExternalInterface(IPip.DESCRIPTOR, this::createExternalInterface, this); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java index 2c5d346224a3..19428ee39919 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipController.java @@ -20,8 +20,6 @@ import static android.app.WindowConfiguration.ROTATION_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_PIP; - import android.annotation.NonNull; import android.app.ActivityManager; import android.app.PictureInPictureParams; @@ -213,7 +211,7 @@ public class PipController implements ConfigurationChangeListener, }); // Allow other outside processes to bind to PiP controller using the key below. - mShellController.addExternalInterface(KEY_EXTRA_SHELL_PIP, + mShellController.addExternalInterface(IPip.DESCRIPTOR, this::createExternalInterface, this); mShellController.addConfigurationChangeListener(this); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java index b171db2c3793..1a012e075be5 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipTransition.java @@ -21,6 +21,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.view.Surface.ROTATION_0; import static android.view.Surface.ROTATION_270; import static android.view.Surface.ROTATION_90; +import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_CLOSE; import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_PIP; @@ -30,6 +31,7 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT; import static com.android.wm.shell.transition.Transitions.TRANSIT_EXIT_PIP; import static com.android.wm.shell.transition.Transitions.TRANSIT_REMOVE_PIP; import static com.android.wm.shell.transition.Transitions.TRANSIT_RESIZE_PIP; +import static com.android.wm.shell.transition.Transitions.transitTypeToString; import android.animation.ValueAnimator; import android.annotation.NonNull; @@ -44,6 +46,7 @@ import android.os.Bundle; import android.os.IBinder; import android.view.Surface; import android.view.SurfaceControl; +import android.view.WindowManager; import android.window.TransitionInfo; import android.window.TransitionRequestInfo; import android.window.WindowContainerToken; @@ -282,6 +285,31 @@ public class PipTransition extends PipTransitionController implements } @Override + public boolean isEnteringPip(@NonNull TransitionInfo.Change change, + @WindowManager.TransitionType int transitType) { + if (change.getTaskInfo() != null + && change.getTaskInfo().getWindowingMode() == WINDOWING_MODE_PINNED) { + // TRANSIT_TO_FRONT, though uncommon with triggering PiP, should semantically also + // be allowed to animate if the task in question is pinned already - see b/308054074. + if (transitType == TRANSIT_PIP || transitType == TRANSIT_OPEN + || transitType == TRANSIT_TO_FRONT) { + return true; + } + // This can happen if the request to enter PIP happens when we are collecting for + // another transition, such as TRANSIT_CHANGE (display rotation). + if (transitType == TRANSIT_CHANGE) { + return true; + } + + // Please file a bug to handle the unexpected transition type. + android.util.Slog.e(TAG, "Found new PIP in transition with mis-matched type=" + + transitTypeToString(transitType), new Throwable()); + } + return false; + } + + + @Override public void end() { if (mTransitionAnimator != null && mTransitionAnimator.isRunning()) { mTransitionAnimator.end(); @@ -662,19 +690,6 @@ public class PipTransition extends PipTransitionController implements } @Nullable - private TransitionInfo.Change getDeferConfigActivityChange(TransitionInfo info, - @NonNull WindowContainerToken parent) { - for (TransitionInfo.Change change : info.getChanges()) { - if (change.getTaskInfo() == null - && change.hasFlags(TransitionInfo.FLAG_CONFIG_AT_END) - && change.getParent() != null && change.getParent().equals(parent)) { - return change; - } - } - return null; - } - - @Nullable private TransitionInfo.Change getChangeByToken(TransitionInfo info, WindowContainerToken token) { for (TransitionInfo.Change change : info.getChanges()) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java index 441f96728d0c..b922cd029468 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java @@ -24,7 +24,6 @@ import static android.view.Display.INVALID_DISPLAY; import static com.android.wm.shell.Flags.enableShellTopTaskTracking; import static com.android.wm.shell.desktopmode.DesktopWallpaperActivity.isWallpaperTask; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TASK_OBSERVER; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_RECENT_TASKS; import android.Manifest; import android.annotation.RequiresPermission; @@ -181,7 +180,7 @@ public class RecentTasksController implements TaskStackListenerCallback, @RequiresPermission(Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE) void onInit() { - mShellController.addExternalInterface(KEY_EXTRA_SHELL_RECENT_TASKS, + mShellController.addExternalInterface(IRecentTasks.DESCRIPTOR, this::createExternalInterface, this); mShellCommandHandler.addDumpCallback(this::dump, this); mUserId = ActivityManager.getCurrentUser(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java index 032dac9ff3a2..37d58780fc85 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentsTransitionHandler.java @@ -1317,9 +1317,6 @@ public class RecentsTransitionHandler implements Transitions.TransitionHandler, // otherwise a new transition will notify the relevant observers if (returningToApp && allAppsAreTranslucent(mPausingTasks)) { mHomeTransitionObserver.notifyHomeVisibilityChanged(true); - } else if (!toHome && mState == STATE_NEW_TASK - && allAppsAreTranslucent(mOpeningTasks)) { - // We are opening a translucent app. Launcher is still visible so we do nothing. } else if (!toHome) { // For some transitions, we may have notified home activity that it became // visible. We need to notify the observer that we are no longer going home. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index fc757ef6df96..a368245db25f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -32,7 +32,6 @@ import static com.android.wm.shell.common.split.SplitScreenUtils.isValidToSplit; import static com.android.wm.shell.common.split.SplitScreenUtils.reverseSplitPosition; import static com.android.wm.shell.common.split.SplitScreenUtils.splitFailureMessage; import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_SPLIT_SCREEN; import static com.android.wm.shell.shared.split.SplitScreenConstants.KEY_EXTRA_WIDGET_INTENT; import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_INDEX_0; import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_INDEX_1; @@ -282,7 +281,7 @@ public class SplitScreenController implements SplitDragPolicy.Starter, mShellCommandHandler.addCommandCallback("splitscreen", mSplitScreenShellCommandHandler, this); mShellController.addKeyguardChangeListener(this); - mShellController.addExternalInterface(KEY_EXTRA_SHELL_SPLIT_SCREEN, + mShellController.addExternalInterface(ISplitScreen.DESCRIPTOR, this::createExternalInterface, this); if (mStageCoordinator == null) { // TODO: Multi-display diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingWindowController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingWindowController.java index 7cb8e8aa7b49..72bad4193f4a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingWindowController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/StartingWindowController.java @@ -23,8 +23,6 @@ import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_SOLID_COLOR import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_SPLASH_SCREEN; import static android.window.StartingWindowInfo.STARTING_WINDOW_TYPE_WINDOWLESS; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_STARTING_WINDOW; - import android.app.ActivityManager.RunningTaskInfo; import android.app.TaskInfo; import android.content.Context; @@ -119,7 +117,7 @@ public class StartingWindowController implements RemoteCallable<StartingWindowCo private void onInit() { mShellTaskOrganizer.initStartingWindow(this); - mShellController.addExternalInterface(KEY_EXTRA_SHELL_STARTING_WINDOW, + mShellController.addExternalInterface(IStartingWindow.DESCRIPTOR, this::createExternalInterface, this); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java index 92d1f9c26bbc..41c0a11827bb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java @@ -287,6 +287,7 @@ public class DefaultMixedHandler implements MixedTransitionHandler, MixedTransition.TYPE_ENTER_PIP_FROM_ACTIVITY_EMBEDDING, transition)); // Postpone transition splitting to later. WindowContainerTransaction out = new WindowContainerTransaction(); + mPipHandler.augmentRequest(transition, request, out); return out; } else if (request.getRemoteTransition() != null && TransitionUtil.isOpeningType(request.getType()) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java index 3d3de88cdafc..03ded730865e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java @@ -16,6 +16,7 @@ package com.android.wm.shell.transition; +import static android.view.WindowManager.TRANSIT_PIP; import static android.view.WindowManager.TRANSIT_TO_BACK; import static com.android.wm.shell.transition.DefaultMixedHandler.subCopy; @@ -37,6 +38,8 @@ import com.android.wm.shell.protolog.ShellProtoLogGroup; import com.android.wm.shell.splitscreen.StageCoordinator; import com.android.wm.shell.unfold.UnfoldTransitionHandler; +import java.util.List; + class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { private final UnfoldTransitionHandler mUnfoldHandler; private final ActivityEmbeddingController mActivityEmbeddingController; @@ -127,6 +130,13 @@ class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { } } + TransitionInfo.Change pipActivityChange = null; + if (pipChange != null) { + pipActivityChange = mPipHandler.getDeferConfigActivityChange( + info, pipChange.getContainer()); + everythingElse.getChanges().remove(pipActivityChange); + } + final Transitions.TransitionFinishCallback finishCB = (wct) -> { --mInFlightSubAnimations; joinFinishArgs(wct); @@ -139,13 +149,23 @@ class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { return false; } - // PIP window should always be on the highest Z order. - if (pipChange != null) { + if (pipChange != null && pipActivityChange == null) { + // We are operating on a single PiP task for the enter animation here. mInFlightSubAnimations = 2; + // PIP window should always be on the highest Z order. mPipHandler.startEnterAnimation( pipChange, startTransaction.setLayer(pipChange.getLeash(), Integer.MAX_VALUE), finishTransaction, finishCB); + } else if (pipActivityChange != null) { + // If there is both a PiP task and a PiP config-at-end activity change, + // put them into a separate TransitionInfo, and send to be animated as TRANSIT_PIP. + mInFlightSubAnimations = 2; + TransitionInfo pipInfo = subCopy(info, TRANSIT_PIP, false /* withChanges */); + pipInfo.getChanges().addAll(List.of(pipChange, pipActivityChange)); + mPipHandler.startAnimation(mTransition, pipInfo, + startTransaction.setLayer(pipChange.getLeash(), Integer.MAX_VALUE), + finishTransaction, finishCB); } else { mInFlightSubAnimations = 1; } 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 3f191497e1ed..611f3e0ac5e8 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 @@ -41,7 +41,6 @@ import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPI import static com.android.systemui.shared.Flags.returnAnimationFrameworkLongLived; import static com.android.window.flags.Flags.ensureWallpaperInTransitions; import static com.android.window.flags.Flags.migratePredictiveBackTransition; -import static com.android.wm.shell.shared.ShellSharedConstants.KEY_EXTRA_SHELL_SHELL_TRANSITIONS; import static com.android.wm.shell.shared.TransitionUtil.isClosingType; import static com.android.wm.shell.shared.TransitionUtil.isOpeningType; @@ -373,7 +372,7 @@ public class Transitions implements RemoteCallable<Transitions>, if (Transitions.ENABLE_SHELL_TRANSITIONS) { mOrganizer.shareTransactionQueue(); } - mShellController.addExternalInterface(KEY_EXTRA_SHELL_SHELL_TRANSITIONS, + mShellController.addExternalInterface(IShellTransitions.DESCRIPTOR, this::createExternalInterface, this); ContentResolver resolver = mContext.getContentResolver(); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java index 885f3dbed275..0b919668f7fe 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java @@ -68,6 +68,8 @@ import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.FocusTransitionObserver; import com.android.wm.shell.transition.Transitions; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier; import com.android.wm.shell.windowdecor.extension.TaskInfoKt; /** @@ -90,6 +92,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT private final Transitions mTransitions; private final Region mExclusionRegion = Region.obtain(); private final InputManager mInputManager; + private final WindowDecorViewHostSupplier<WindowDecorViewHost> mWindowDecorViewHostSupplier; private TaskOperations mTaskOperations; private FocusTransitionObserver mFocusTransitionObserver; @@ -130,7 +133,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer, SyncTransactionQueue syncQueue, Transitions transitions, - FocusTransitionObserver focusTransitionObserver) { + FocusTransitionObserver focusTransitionObserver, + WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier) { mContext = context; mMainExecutor = shellExecutor; mMainHandler = mainHandler; @@ -143,6 +147,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT mSyncQueue = syncQueue; mTransitions = transitions; mFocusTransitionObserver = focusTransitionObserver; + mWindowDecorViewHostSupplier = windowDecorViewHostSupplier; if (!Transitions.ENABLE_SHELL_TRANSITIONS) { mTaskOperations = new TaskOperations(null, mContext, mSyncQueue); } @@ -332,7 +337,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT mMainHandler, mBgExecutor, mMainChoreographer, - mSyncQueue); + mSyncQueue, + mWindowDecorViewHostSupplier); mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration); final FluidResizeTaskPositioner taskPositioner = diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java index aa954fbe5669..23bb2aa616f9 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java @@ -58,6 +58,8 @@ import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.SyncTransactionQueue; import com.android.wm.shell.shared.annotations.ShellBackgroundThread; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier; import com.android.wm.shell.windowdecor.extension.TaskInfoKt; /** @@ -90,8 +92,10 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL Handler handler, @ShellBackgroundThread ShellExecutor bgExecutor, Choreographer choreographer, - SyncTransactionQueue syncQueue) { - super(context, userContext, displayController, taskOrganizer, taskInfo, taskSurface); + SyncTransactionQueue syncQueue, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier) { + super(context, userContext, displayController, taskOrganizer, taskInfo, + taskSurface, windowDecorViewHostSupplier); mHandler = handler; mBgExecutor = bgExecutor; mChoreographer = choreographer; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java index e8b02dcb7a71..9dbac761d104 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java @@ -79,6 +79,7 @@ import android.view.SurfaceControl; import android.view.SurfaceControl.Transaction; import android.view.View; import android.view.ViewConfiguration; +import android.view.ViewRootImpl; import android.view.WindowManager; import android.window.DesktopModeFlags; import android.window.TaskSnapshot; @@ -139,6 +140,8 @@ import com.android.wm.shell.sysui.ShellInit; import com.android.wm.shell.transition.FocusTransitionObserver; import com.android.wm.shell.transition.Transitions; import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration.ExclusionRegionListener; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier; import com.android.wm.shell.windowdecor.extension.InsetsStateKt; import com.android.wm.shell.windowdecor.extension.TaskInfoKt; import com.android.wm.shell.windowdecor.viewholder.AppHeaderViewHolder; @@ -217,6 +220,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, private boolean mInImmersiveMode; private final String mSysUIPackageName; private final AssistContentRequester mAssistContentRequester; + private final WindowDecorViewHostSupplier<WindowDecorViewHost> mWindowDecorViewHostSupplier; private final DisplayChangeController.OnDisplayChangingListener mOnDisplayChangingListener; private final ISystemGestureExclusionListener mGestureExclusionListener = @@ -260,6 +264,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, InteractionJankMonitor interactionJankMonitor, AppToWebGenericLinksParser genericLinksParser, AssistContentRequester assistContentRequester, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier, MultiInstanceHelper multiInstanceHelper, Optional<DesktopTasksLimiter> desktopTasksLimiter, AppHandleEducationController appHandleEducationController, @@ -289,6 +294,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, desktopImmersiveController, genericLinksParser, assistContentRequester, + windowDecorViewHostSupplier, multiInstanceHelper, new DesktopModeWindowDecoration.Factory(), new InputMonitorFactory(), @@ -329,6 +335,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, DesktopImmersiveController desktopImmersiveController, AppToWebGenericLinksParser genericLinksParser, AssistContentRequester assistContentRequester, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier, MultiInstanceHelper multiInstanceHelper, DesktopModeWindowDecoration.Factory desktopModeWindowDecorFactory, InputMonitorFactory inputMonitorFactory, @@ -381,6 +388,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, mWindowDecorCaptionHandleRepository = windowDecorCaptionHandleRepository; mActivityOrientationChangeHandler = activityOrientationChangeHandler; mAssistContentRequester = assistContentRequester; + mWindowDecorViewHostSupplier = windowDecorViewHostSupplier; mOnDisplayChangingListener = (displayId, fromRotation, toRotation, displayAreaInfo, t) -> { DesktopModeWindowDecoration decoration; RunningTaskInfo taskInfo; @@ -965,8 +973,11 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, } if (mInputManager != null && !Flags.enableAccessibleCustomHeaders()) { - // Pilfer so that windows below receive cancellations for this gesture. - mInputManager.pilferPointers(v.getViewRootImpl().getInputToken()); + ViewRootImpl viewRootImpl = v.getViewRootImpl(); + if (viewRootImpl != null) { + // Pilfer so that windows below receive cancellations for this gesture. + mInputManager.pilferPointers(viewRootImpl.getInputToken()); + } } if (isUpOrCancel) { // Gesture is finished, reset state. @@ -1623,6 +1634,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, mRootTaskDisplayAreaOrganizer, mGenericLinksParser, mAssistContentRequester, + mWindowDecorViewHostSupplier, mMultiInstanceHelper, mWindowDecorCaptionHandleRepository, mDesktopModeEventLogger); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java index bd84cccc4e0b..6562f38e724d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java @@ -43,7 +43,6 @@ import static com.android.wm.shell.windowdecor.DragPositioningCallbackUtility.Dr import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.SuppressLint; import android.app.ActivityManager; import android.app.WindowConfiguration.WindowingMode; import android.app.assist.AssistContent; @@ -106,6 +105,8 @@ import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource; import com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer; import com.android.wm.shell.splitscreen.SplitScreenController; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier; import com.android.wm.shell.windowdecor.extension.TaskInfoKt; import com.android.wm.shell.windowdecor.viewholder.AppHandleViewHolder; import com.android.wm.shell.windowdecor.viewholder.AppHeaderViewHolder; @@ -128,7 +129,6 @@ import java.util.function.Supplier; */ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLinearLayout> { private static final String TAG = "DesktopModeWindowDecoration"; - private static final int CAPTURED_LINK_TIMEOUT_MS = 7000; @VisibleForTesting static final long CLOSE_MAXIMIZE_MENU_DELAY_MS = 150L; @@ -158,14 +158,11 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin private Function0<Unit> mOnMaximizeHoverListener; private DragPositioningCallback mDragPositioningCallback; private DragResizeInputListener mDragResizeListener; - private Runnable mCurrentViewHostRunnable = null; private RelayoutParams mRelayoutParams = new RelayoutParams(); private DisabledEdge mDisabledResizingEdge = NONE; private final WindowDecoration.RelayoutResult<WindowDecorLinearLayout> mResult = new WindowDecoration.RelayoutResult<>(); - private final Runnable mViewHostRunnable = - () -> updateViewHost(mRelayoutParams, null /* onDrawTransaction */, mResult); private final Point mPositionInParent = new Point(); private HandleMenu mHandleMenu; @@ -203,7 +200,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin // being hovered. There's a small delay after stopping the hover, to allow a quick reentry // to cancel the close. private final Runnable mCloseMaximizeWindowRunnable = this::closeMaximizeMenu; - private final Runnable mCapturedLinkExpiredRunnable = this::onCapturedLinkExpired; private final MultiInstanceHelper mMultiInstanceHelper; private final WindowDecorCaptionHandleRepository mWindowDecorCaptionHandleRepository; private final DesktopUserRepositories mDesktopUserRepositories; @@ -225,6 +221,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer, AppToWebGenericLinksParser genericLinksParser, AssistContentRequester assistContentRequester, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier, MultiInstanceHelper multiInstanceHelper, WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository, DesktopModeEventLogger desktopModeEventLogger) { @@ -236,6 +233,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin WindowContainerTransaction::new, SurfaceControl::new, new WindowManagerWrapper( context.getSystemService(WindowManager.class)), new SurfaceControlViewHostFactory() {}, + windowDecorViewHostSupplier, DefaultMaximizeMenuFactory.INSTANCE, DefaultHandleMenuFactory.INSTANCE, multiInstanceHelper, windowDecorCaptionHandleRepository, desktopModeEventLogger); @@ -264,15 +262,16 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin Supplier<SurfaceControl> surfaceControlSupplier, WindowManagerWrapper windowManagerWrapper, SurfaceControlViewHostFactory surfaceControlViewHostFactory, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier, MaximizeMenuFactory maximizeMenuFactory, HandleMenuFactory handleMenuFactory, MultiInstanceHelper multiInstanceHelper, WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository, DesktopModeEventLogger desktopModeEventLogger) { - super(context, userContext, displayController, taskOrganizer, taskInfo, taskSurface, - surfaceControlBuilderSupplier, surfaceControlTransactionSupplier, + super(context, userContext, displayController, taskOrganizer, taskInfo, + taskSurface, surfaceControlBuilderSupplier, surfaceControlTransactionSupplier, windowContainerTransactionSupplier, surfaceControlSupplier, - surfaceControlViewHostFactory, desktopModeEventLogger); + surfaceControlViewHostFactory, windowDecorViewHostSupplier, desktopModeEventLogger); mSplitScreenController = splitScreenController; mHandler = handler; mBgExecutor = bgExecutor; @@ -451,78 +450,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin boolean applyStartTransactionOnDraw, boolean shouldSetTaskVisibilityPositionAndCrop, boolean hasGlobalFocus, @NonNull Region displayExclusionRegion) { Trace.beginSection("DesktopModeWindowDecoration#relayout"); - if (taskInfo.isFreeform()) { - // The Task is in Freeform mode -> show its header in sync since it's an integral part - // of the window itself - a delayed header might cause bad UX. - relayoutInSync(taskInfo, startT, finishT, applyStartTransactionOnDraw, - shouldSetTaskVisibilityPositionAndCrop, hasGlobalFocus, displayExclusionRegion); - } else { - // The Task is outside Freeform mode -> allow the handle view to be delayed since the - // handle is just a small addition to the window. - relayoutWithDelayedViewHost(taskInfo, startT, finishT, applyStartTransactionOnDraw, - shouldSetTaskVisibilityPositionAndCrop, hasGlobalFocus, displayExclusionRegion); - } - Trace.endSection(); - } - - /** Run the whole relayout phase immediately without delay. */ - private void relayoutInSync(ActivityManager.RunningTaskInfo taskInfo, - SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, - boolean applyStartTransactionOnDraw, boolean shouldSetTaskVisibilityPositionAndCrop, - boolean hasGlobalFocus, @NonNull Region displayExclusionRegion) { - // Clear the current ViewHost runnable as we will update the ViewHost here - clearCurrentViewHostRunnable(); - updateRelayoutParamsAndSurfaces(taskInfo, startT, finishT, applyStartTransactionOnDraw, - shouldSetTaskVisibilityPositionAndCrop, hasGlobalFocus, displayExclusionRegion); - if (mResult.mRootView != null) { - updateViewHost(mRelayoutParams, startT, mResult); - } - } - - /** - * Clear the current ViewHost runnable - to ensure it doesn't run once relayout params have been - * updated. - */ - private void clearCurrentViewHostRunnable() { - if (mCurrentViewHostRunnable != null) { - mHandler.removeCallbacks(mCurrentViewHostRunnable); - mCurrentViewHostRunnable = null; - } - } - /** - * Relayout the window decoration but repost some of the work, to unblock the current callstack. - */ - private void relayoutWithDelayedViewHost(ActivityManager.RunningTaskInfo taskInfo, - SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, - boolean applyStartTransactionOnDraw, boolean shouldSetTaskVisibilityPositionAndCrop, - boolean hasGlobalFocus, - @NonNull Region displayExclusionRegion) { - if (applyStartTransactionOnDraw) { - throw new IllegalArgumentException( - "We cannot both sync viewhost ondraw and delay viewhost creation."); - } - // Clear the current ViewHost runnable as we will update the ViewHost here - clearCurrentViewHostRunnable(); - updateRelayoutParamsAndSurfaces(taskInfo, startT, finishT, - false /* applyStartTransactionOnDraw */, shouldSetTaskVisibilityPositionAndCrop, - hasGlobalFocus, displayExclusionRegion); - if (mResult.mRootView == null) { - // This means something blocks the window decor from showing, e.g. the task is hidden. - // Nothing is set up in this case including the decoration surface. - return; - } - // Store the current runnable so it can be removed if we start a new relayout. - mCurrentViewHostRunnable = mViewHostRunnable; - mHandler.post(mCurrentViewHostRunnable); - } - - @SuppressLint("MissingPermission") - private void updateRelayoutParamsAndSurfaces(ActivityManager.RunningTaskInfo taskInfo, - SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, - boolean applyStartTransactionOnDraw, boolean shouldSetTaskVisibilityPositionAndCrop, - boolean hasGlobalFocus, @NonNull Region displayExclusionRegion) { - Trace.beginSection("DesktopModeWindowDecoration#updateRelayoutParamsAndSurfaces"); if (Flags.enableDesktopWindowingAppToWeb()) { setCapturedLink(taskInfo.capturedLink, taskInfo.capturedLinkTimestamp); } @@ -543,9 +471,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin final boolean inFullImmersive = mDesktopUserRepositories.getProfile(taskInfo.userId) .isTaskInFullImmersiveState(taskInfo.taskId); - updateRelayoutParams(mRelayoutParams, mContext, taskInfo, applyStartTransactionOnDraw, - shouldSetTaskVisibilityPositionAndCrop, mIsStatusBarVisible, - mIsKeyguardVisibleAndOccluded, inFullImmersive, + updateRelayoutParams(mRelayoutParams, mContext, taskInfo, mSplitScreenController, + applyStartTransactionOnDraw, shouldSetTaskVisibilityPositionAndCrop, + mIsStatusBarVisible, mIsKeyguardVisibleAndOccluded, inFullImmersive, mDisplayController.getInsetsState(taskInfo.displayId), hasGlobalFocus, displayExclusionRegion); @@ -553,9 +481,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin final SurfaceControl oldDecorationSurface = mDecorationContainerSurface; final WindowContainerTransaction wct = new WindowContainerTransaction(); - Trace.beginSection("DesktopModeWindowDecoration#relayout-updateViewsAndSurfaces"); - updateViewsAndSurfaces(mRelayoutParams, startT, finishT, wct, oldRootView, mResult); - Trace.endSection(); + relayout(mRelayoutParams, startT, finishT, wct, oldRootView, mResult); // After this line, mTaskInfo is up-to-date and should be used instead of taskInfo Trace.beginSection("DesktopModeWindowDecoration#relayout-applyWCT"); @@ -570,7 +496,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } mExclusionRegionListener.onExclusionRegionDismissed(mTaskInfo.taskId); disposeStatusBarInputLayer(); - Trace.endSection(); // DesktopModeWindowDecoration#updateRelayoutParamsAndSurfaces + Trace.endSection(); // DesktopModeWindowDecoration#relayout return; } @@ -578,7 +504,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin disposeStatusBarInputLayer(); mWindowDecorViewHolder = createViewHolder(); } - Trace.beginSection("DesktopModeWindowDecoration#relayout-binding"); final Point position = new Point(); if (isAppHandle(mWindowDecorViewHolder)) { @@ -588,6 +513,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin notifyCaptionStateChanged(); } + Trace.beginSection("DesktopModeWindowDecoration#relayout-bindData"); if (isAppHandle(mWindowDecorViewHolder)) { mWindowDecorViewHolder.bindData(new AppHandleViewHolder.HandleData( mTaskInfo, position, mResult.mCaptionWidth, mResult.mCaptionHeight, @@ -612,7 +538,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } updateDragResizeListener(oldDecorationSurface, inFullImmersive); updateMaximizeMenu(startT, inFullImmersive); - Trace.endSection(); // DesktopModeWindowDecoration#updateRelayoutParamsAndSurfaces + Trace.endSection(); // DesktopModeWindowDecoration#relayout } private boolean isCaptionVisible() { @@ -625,22 +551,12 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin return; } mCapturedLink = new CapturedLink(capturedLink, timeStamp); - mHandler.postDelayed(mCapturedLinkExpiredRunnable, CAPTURED_LINK_TIMEOUT_MS); - } - - private void onCapturedLinkExpired() { - mHandler.removeCallbacks(mCapturedLinkExpiredRunnable); - if (mCapturedLink != null) { - mCapturedLink.setExpired(); - } } @Nullable private Intent getBrowserLink() { final Uri browserLink; - // If the captured link is available and has not expired, return the captured link. - // Otherwise, return the generic link which is set to null if a generic link is unavailable. - if (mCapturedLink != null && !mCapturedLink.mExpired) { + if (isCapturedLinkAvailable()) { browserLink = mCapturedLink.mUri; } else if (mWebUri != null) { browserLink = mWebUri; @@ -752,7 +668,13 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin } private boolean isCapturedLinkAvailable() { - return mCapturedLink != null && !mCapturedLink.mExpired; + return mCapturedLink != null && !mCapturedLink.mUsed; + } + + private void onCapturedLinkUsed() { + if (mCapturedLink != null) { + mCapturedLink.setUsed(); + } } private void notifyNoCaptionHandle() { @@ -877,6 +799,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin RelayoutParams relayoutParams, Context context, ActivityManager.RunningTaskInfo taskInfo, + SplitScreenController splitScreenController, boolean applyStartTransactionOnDraw, boolean shouldSetTaskVisibilityPositionAndCrop, boolean isStatusBarVisible, @@ -896,6 +819,10 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin relayoutParams.mCaptionWidthId = getCaptionWidthId(relayoutParams.mLayoutResId); relayoutParams.mHasGlobalFocus = hasGlobalFocus; relayoutParams.mDisplayExclusionRegion.set(displayExclusionRegion); + // Allow the handle view to be delayed since the handle is just a small addition to the + // window, whereas the header cannot be delayed because it is expected to be visible from + // the first frame. + relayoutParams.mAsyncViewHost = isAppHandle; final boolean showCaption; if (Flags.enableFullyImmersiveInDesktop()) { @@ -918,7 +845,10 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin || (isStatusBarVisible && !isKeyguardVisibleAndOccluded); } relayoutParams.mIsCaptionVisible = showCaption; - relayoutParams.mIsInsetSource = isAppHeader && !inFullImmersiveMode; + final boolean isBottomSplit = !splitScreenController.isLeftRightSplit() + && splitScreenController.getSplitPosition(taskInfo.taskId) + == SPLIT_POSITION_BOTTOM_OR_RIGHT; + relayoutParams.mIsInsetSource = (isAppHeader && !inFullImmersiveMode) || isBottomSplit; if (isAppHeader) { if (TaskInfoKt.isTransparentCaptionBarAppearance(taskInfo)) { // The app is requesting to customize the caption bar, which means input on @@ -1434,7 +1364,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin /* onAspectRatioSettingsClickListener= */ mOnChangeAspectRatioClickListener, /* openInBrowserClickListener= */ (intent) -> { mOpenInBrowserClickListener.accept(intent); - onCapturedLinkExpired(); + onCapturedLinkUsed(); if (Flags.enableDesktopWindowingAppToWebEducationIntegration()) { mWindowDecorCaptionHandleRepository.onAppToWebUsage(); } @@ -1699,7 +1629,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin mExclusionRegionListener.onExclusionRegionDismissed(mTaskInfo.taskId); disposeResizeVeil(); disposeStatusBarInputLayer(); - clearCurrentViewHostRunnable(); if (canEnterDesktopMode(mContext) && isEducationEnabled()) { notifyNoCaptionHandle(); } @@ -1836,6 +1765,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer, AppToWebGenericLinksParser genericLinksParser, AssistContentRequester assistContentRequester, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> + windowDecorViewHostSupplier, MultiInstanceHelper multiInstanceHelper, WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository, DesktopModeEventLogger desktopModeEventLogger) { @@ -1856,6 +1787,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin rootTaskDisplayAreaOrganizer, genericLinksParser, assistContentRequester, + windowDecorViewHostSupplier, multiInstanceHelper, windowDecorCaptionHandleRepository, desktopModeEventLogger); @@ -1866,16 +1798,15 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin static class CapturedLink { private final long mTimeStamp; private final Uri mUri; - private boolean mExpired; + private boolean mUsed; CapturedLink(@NonNull Uri uri, long timeStamp) { mUri = uri; mTimeStamp = timeStamp; - mExpired = false; } - void setExpired() { - mExpired = true; + private void setUsed() { + mUsed = true; } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java index 584ee39ab317..5d1bedb85b5e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration.java @@ -61,6 +61,8 @@ import com.android.wm.shell.desktopmode.DesktopModeEventLogger; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.windowdecor.WindowDecoration.RelayoutParams.OccludingCaptionElement; import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalViewHostViewContainer; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier; import com.android.wm.shell.windowdecor.extension.InsetsStateKt; import java.util.ArrayList; @@ -88,10 +90,10 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> implements AutoCloseable { /** - * The Z-order of {@link #mCaptionContainerSurface}. + * The Z-order of the caption surface. * <p> * We use {@link #mDecorationContainerSurface} to define input window for task resizing; by - * layering it in front of {@link #mCaptionContainerSurface}, we can allow it to handle input + * layering it in front of the caption surface, we can allow it to handle input * prior to caption view itself, treating corner inputs as resize events rather than * repositioning. */ @@ -100,7 +102,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> * The Z-order of the task input sink in {@link DragPositioningCallback}. * <p> * This task input sink is used to prevent undesired dispatching of motion events out of task - * bounds; by layering it behind {@link #mCaptionContainerSurface}, we allow captions to handle + * bounds; by layering it behind the caption surface, we allow captions to handle * input events first. */ static final int INPUT_SINK_Z_ORDER = -2; @@ -126,6 +128,8 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> final Supplier<SurfaceControl.Transaction> mSurfaceControlTransactionSupplier; final Supplier<WindowContainerTransaction> mWindowContainerTransactionSupplier; final SurfaceControlViewHostFactory mSurfaceControlViewHostFactory; + @NonNull private final WindowDecorViewHostSupplier<WindowDecorViewHost> + mWindowDecorViewHostSupplier; private final DisplayController.OnDisplaysChangedListener mOnDisplaysChangedListener = new DisplayController.OnDisplaysChangedListener() { @Override @@ -150,9 +154,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> Display mDisplay; SurfaceControl mDecorationContainerSurface; - SurfaceControl mCaptionContainerSurface; - private CaptionWindowlessWindowManager mCaptionWindowManager; - private SurfaceControlViewHost mViewHost; + private WindowDecorViewHost mViewHost; private Configuration mWindowDecorConfig; TaskDragResizer mTaskDragResizer; boolean mIsCaptionVisible; @@ -173,11 +175,13 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> DisplayController displayController, ShellTaskOrganizer taskOrganizer, RunningTaskInfo taskInfo, - SurfaceControl taskSurface) { - this(context, userContext, displayController, taskOrganizer, taskInfo, taskSurface, - SurfaceControl.Builder::new, SurfaceControl.Transaction::new, + SurfaceControl taskSurface, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier) { + this(context, userContext, displayController, taskOrganizer, taskInfo, + taskSurface, SurfaceControl.Builder::new, SurfaceControl.Transaction::new, WindowContainerTransaction::new, SurfaceControl::new, - new SurfaceControlViewHostFactory() {}, new DesktopModeEventLogger()); + new SurfaceControlViewHostFactory() {}, windowDecorViewHostSupplier, + new DesktopModeEventLogger()); } WindowDecoration( @@ -192,6 +196,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> Supplier<WindowContainerTransaction> windowContainerTransactionSupplier, Supplier<SurfaceControl> surfaceControlSupplier, SurfaceControlViewHostFactory surfaceControlViewHostFactory, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier, @NonNull DesktopModeEventLogger desktopModeEventLogger ) { mContext = context; @@ -205,6 +210,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mSurfaceControlTransactionSupplier = surfaceControlTransactionSupplier; mWindowContainerTransactionSupplier = windowContainerTransactionSupplier; mSurfaceControlViewHostFactory = surfaceControlViewHostFactory; + mWindowDecorViewHostSupplier = windowDecorViewHostSupplier; mDisplay = mDisplayController.getDisplay(mTaskInfo.displayId); final InsetsState insetsState = mDisplayController.getInsetsState(mTaskInfo.displayId); mIsStatusBarVisible = insetsState != null @@ -240,15 +246,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> void relayout(RelayoutParams params, SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, WindowContainerTransaction wct, T rootView, RelayoutResult<T> outResult) { - updateViewsAndSurfaces(params, startT, finishT, wct, rootView, outResult); - if (outResult.mRootView != null) { - updateViewHost(params, startT, outResult); - } - } - - protected void updateViewsAndSurfaces(RelayoutParams params, - SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT, - WindowContainerTransaction wct, T rootView, RelayoutResult<T> outResult) { + Trace.beginSection("WindowDecoration#relayout"); outResult.reset(); if (params.mRunningTaskInfo != null) { mTaskInfo = params.mRunningTaskInfo; @@ -263,17 +261,21 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> if (params.mSetTaskVisibilityPositionAndCrop) { finishT.hide(mTaskSurface); } + Trace.endSection(); // WindowDecoration#relayout return; } - + Trace.beginSection("WindowDecoration#relayout-inflateIfNeeded"); inflateIfNeeded(params, wct, rootView, oldLayoutResId, outResult); - if (outResult.mRootView == null) { - // Didn't manage to create a root view, early out. + Trace.endSection(); + final boolean hasCaptionView = outResult.mRootView != null; + if (!hasCaptionView) { + Trace.endSection(); // WindowDecoration#relayout return; } - rootView = null; // Clear it just in case we use it accidentally + Trace.beginSection("WindowDecoration#relayout-updateCaptionVisibility"); updateCaptionVisibility(outResult.mRootView, params); + Trace.endSection(); final Rect taskBounds = mTaskInfo.getConfiguration().windowConfiguration.getBounds(); outResult.mWidth = taskBounds.width(); @@ -288,10 +290,65 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> outResult.mCaptionY = 0; outResult.mCaptionTopPadding = params.mCaptionTopPadding; + Trace.beginSection("relayout-createViewHostIfNeeded"); + createViewHostIfNeeded(mDecorWindowContext, mDisplay); + Trace.endSection(); + + Trace.beginSection("WindowDecoration#relayout-updateSurfacesAndInsets"); + final SurfaceControl captionSurface = mViewHost.getSurfaceControl(); updateDecorationContainerSurface(startT, outResult); - updateCaptionContainerSurface(startT, outResult); + updateCaptionContainerSurface(captionSurface, startT, outResult); updateCaptionInsets(params, wct, outResult, taskBounds); updateTaskSurface(params, startT, finishT, outResult); + Trace.endSection(); + + Trace.beginSection("WindowDecoration#relayout-updateViewHost"); + outResult.mRootView.setPadding(0, params.mCaptionTopPadding, 0, 0); + final Rect localCaptionBounds = new Rect( + outResult.mCaptionX, + outResult.mCaptionY, + outResult.mCaptionX + outResult.mCaptionWidth, + outResult.mCaptionY + outResult.mCaptionHeight); + final Region touchableRegion = params.mLimitTouchRegionToSystemAreas + ? calculateLimitedTouchableRegion(params, localCaptionBounds) + : null; + updateViewHierarchy(params, outResult, startT, touchableRegion); + Trace.endSection(); + + Trace.endSection(); // WindowDecoration#relayout + } + + private void createViewHostIfNeeded(@NonNull Context context, @NonNull Display display) { + if (mViewHost == null) { + mViewHost = mWindowDecorViewHostSupplier.acquire(context, display); + } + } + + private void updateViewHierarchy(@NonNull RelayoutParams params, + @NonNull RelayoutResult<T> outResult, @NonNull SurfaceControl.Transaction startT, + @Nullable Region touchableRegion) { + Trace.beginSection("WindowDecoration#updateViewHierarchy"); + final WindowManager.LayoutParams lp = + new WindowManager.LayoutParams( + outResult.mCaptionWidth, + outResult.mCaptionHeight, + TYPE_APPLICATION, + FLAG_NOT_FOCUSABLE | FLAG_SPLIT_TOUCH, + PixelFormat.TRANSPARENT); + lp.setTitle("Caption of Task=" + mTaskInfo.taskId); + lp.setTrustedOverlay(); + lp.inputFeatures = params.mInputFeatures; + if (params.mAsyncViewHost) { + if (params.mApplyStartTransactionOnDraw) { + throw new IllegalArgumentException("Cannot use sync draw tx with async relayout"); + } + mViewHost.updateViewAsync(outResult.mRootView, lp, mTaskInfo.configuration, + touchableRegion); + } else { + mViewHost.updateView(outResult.mRootView, lp, mTaskInfo.configuration, + touchableRegion, params.mApplyStartTransactionOnDraw ? startT : null); + } + Trace.endSection(); } private void inflateIfNeeded(RelayoutParams params, WindowContainerTransaction wct, @@ -359,23 +416,13 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> .show(mDecorationContainerSurface); } - private void updateCaptionContainerSurface( + private void updateCaptionContainerSurface(@NonNull SurfaceControl captionSurface, SurfaceControl.Transaction startT, RelayoutResult<T> outResult) { - if (mCaptionContainerSurface == null) { - final SurfaceControl.Builder builder = mSurfaceControlBuilderSupplier.get(); - mCaptionContainerSurface = builder - .setName("Caption container of Task=" + mTaskInfo.taskId) - .setContainerLayer() - .setParent(mDecorationContainerSurface) - .setCallsite("WindowDecoration.updateCaptionContainerSurface") - .build(); - } - - startT.setWindowCrop(mCaptionContainerSurface, outResult.mCaptionWidth, - outResult.mCaptionHeight) - .setPosition(mCaptionContainerSurface, outResult.mCaptionX, 0 /* y */) - .setLayer(mCaptionContainerSurface, CAPTION_LAYER_Z_ORDER) - .show(mCaptionContainerSurface); + startT.reparent(captionSurface, mDecorationContainerSurface) + .setWindowCrop(captionSurface, outResult.mCaptionWidth, outResult.mCaptionHeight) + .setPosition(captionSurface, outResult.mCaptionX, 0 /* y */) + .setLayer(captionSurface, CAPTION_LAYER_Z_ORDER) + .show(captionSurface); } private void updateCaptionInsets(RelayoutParams params, WindowContainerTransaction wct, @@ -469,80 +516,6 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> } } - /** - * Updates a {@link SurfaceControlViewHost} to connect the window decoration surfaces with our - * View hierarchy. - * - * @param params parameters to use from the last relayout - * @param onDrawTransaction a transaction to apply in sync with #onDraw - * @param outResult results to use from the last relayout - * - */ - protected void updateViewHost(RelayoutParams params, - SurfaceControl.Transaction onDrawTransaction, RelayoutResult<T> outResult) { - Trace.beginSection("CaptionViewHostLayout"); - if (mCaptionWindowManager == null) { - // Put caption under a container surface because ViewRootImpl sets the destination frame - // of windowless window layers and BLASTBufferQueue#update() doesn't support offset. - mCaptionWindowManager = new CaptionWindowlessWindowManager( - mTaskInfo.getConfiguration(), mCaptionContainerSurface); - } - mCaptionWindowManager.setConfiguration(mTaskInfo.getConfiguration()); - final WindowManager.LayoutParams lp = - new WindowManager.LayoutParams( - outResult.mCaptionWidth, - outResult.mCaptionHeight, - TYPE_APPLICATION, - FLAG_NOT_FOCUSABLE | FLAG_SPLIT_TOUCH, - PixelFormat.TRANSPARENT); - lp.setTitle("Caption of Task=" + mTaskInfo.taskId); - lp.setTrustedOverlay(); - lp.inputFeatures = params.mInputFeatures; - final Rect localCaptionBounds = new Rect( - outResult.mCaptionX, - outResult.mCaptionY, - outResult.mCaptionX + outResult.mCaptionWidth, - outResult.mCaptionY + outResult.mCaptionHeight); - final Region touchableRegion = params.mLimitTouchRegionToSystemAreas - ? calculateLimitedTouchableRegion(params, localCaptionBounds) - : null; - if (mViewHost == null) { - Trace.beginSection("CaptionViewHostLayout-new"); - mViewHost = mSurfaceControlViewHostFactory.create(mDecorWindowContext, mDisplay, - mCaptionWindowManager); - if (params.mApplyStartTransactionOnDraw) { - if (onDrawTransaction == null) { - throw new IllegalArgumentException("Trying to sync a null Transaction"); - } - mViewHost.getRootSurfaceControl().applyTransactionOnDraw(onDrawTransaction); - } - outResult.mRootView.setPadding(0, params.mCaptionTopPadding, 0, 0); - if (params.mLimitTouchRegionToSystemAreas) { - mCaptionWindowManager.setTouchRegion(mViewHost, touchableRegion); - } - mViewHost.setView(outResult.mRootView, lp); - Trace.endSection(); - } else { - Trace.beginSection("CaptionViewHostLayout-relayout"); - if (params.mApplyStartTransactionOnDraw) { - if (onDrawTransaction == null) { - throw new IllegalArgumentException("Trying to sync a null Transaction"); - } - mViewHost.getRootSurfaceControl().applyTransactionOnDraw(onDrawTransaction); - } - outResult.mRootView.setPadding(0, params.mCaptionTopPadding, 0, 0); - if (params.mLimitTouchRegionToSystemAreas) { - mCaptionWindowManager.setTouchRegion(mViewHost, touchableRegion); - } - mViewHost.relayout(lp); - Trace.endSection(); - } - if (touchableRegion != null) { - touchableRegion.recycle(); - } - Trace.endSection(); // CaptionViewHostLayout - } - @NonNull private Region calculateLimitedTouchableRegion( RelayoutParams params, @@ -691,18 +664,11 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> } void releaseViews(WindowContainerTransaction wct) { - if (mViewHost != null) { - mViewHost.release(); - mViewHost = null; - } - - mCaptionWindowManager = null; - final SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get(); boolean released = false; - if (mCaptionContainerSurface != null) { - t.remove(mCaptionContainerSurface); - mCaptionContainerSurface = null; + if (mViewHost != null) { + mWindowDecorViewHostSupplier.release(mViewHost, t); + mViewHost = null; released = true; } @@ -855,6 +821,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> boolean mIsCaptionVisible; Configuration mWindowDecorConfig; + boolean mAsyncViewHost; boolean mApplyStartTransactionOnDraw; boolean mSetTaskVisibilityPositionAndCrop; @@ -880,6 +847,7 @@ public abstract class WindowDecoration<T extends View & TaskFocusStateConsumer> mApplyStartTransactionOnDraw = false; mSetTaskVisibilityPositionAndCrop = false; mWindowDecorConfig = null; + mAsyncViewHost = false; mHasGlobalFocus = false; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHost.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHost.kt index c470eef2578c..50aa21e0e34f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHost.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHost.kt @@ -17,6 +17,7 @@ package com.android.wm.shell.windowdecor.common.viewhost import android.content.Context import android.content.res.Configuration +import android.graphics.Region import android.view.Display import android.view.SurfaceControl import android.view.SurfaceControlViewHost @@ -59,7 +60,7 @@ class DefaultWindowDecorViewHost( .setCallsite("DefaultWindowDecorViewHost#init") .build() - private var wwm: WindowlessWindowManager? = null + private var wwm: WindowDecorWindowlessWindowManager? = null @VisibleForTesting var viewHost: SurfaceControlViewHost? = null private var currentUpdateJob: Job? = null @@ -70,11 +71,12 @@ class DefaultWindowDecorViewHost( view: View, attrs: WindowManager.LayoutParams, configuration: Configuration, + touchableRegion: Region?, onDrawTransaction: SurfaceControl.Transaction?, ) { Trace.beginSection("DefaultWindowDecorViewHost#updateView") clearCurrentUpdateJob() - updateViewHost(view, attrs, configuration, onDrawTransaction) + updateViewHost(view, attrs, configuration, touchableRegion, onDrawTransaction) Trace.endSection() } @@ -82,12 +84,19 @@ class DefaultWindowDecorViewHost( view: View, attrs: WindowManager.LayoutParams, configuration: Configuration, + touchableRegion: Region?, ) { Trace.beginSection("DefaultWindowDecorViewHost#updateViewAsync") clearCurrentUpdateJob() currentUpdateJob = mainScope.launch { - updateViewHost(view, attrs, configuration, onDrawTransaction = null) + updateViewHost( + view, + attrs, + configuration, + touchableRegion, + onDrawTransaction = null + ) } Trace.endSection() } @@ -102,13 +111,13 @@ class DefaultWindowDecorViewHost( view: View, attrs: WindowManager.LayoutParams, configuration: Configuration, + touchableRegion: Region?, onDrawTransaction: SurfaceControl.Transaction?, ) { Trace.beginSection("DefaultWindowDecorViewHost#updateViewHost") if (wwm == null) { - wwm = WindowlessWindowManager(configuration, rootSurface, null) + wwm = WindowDecorWindowlessWindowManager(configuration, rootSurface) } - requireWindowlessWindowManager().setConfiguration(configuration) if (viewHost == null) { viewHost = surfaceControlViewHostFactory.invoke( @@ -118,6 +127,10 @@ class DefaultWindowDecorViewHost( "DefaultWindowDecorViewHost#updateViewHost", ) } + requireWindowlessWindowManager().apply { + setConfiguration(configuration) + setTouchRegion(requireViewHost(), touchableRegion) + } onDrawTransaction?.let { requireViewHost().rootSurfaceControl.applyTransactionOnDraw(it) } if (requireViewHost().view == null) { Trace.beginSection("DefaultWindowDecorViewHost#updateViewHost-setView") @@ -137,7 +150,7 @@ class DefaultWindowDecorViewHost( currentUpdateJob = null } - private fun requireWindowlessWindowManager(): WindowlessWindowManager { + private fun requireWindowlessWindowManager(): WindowDecorWindowlessWindowManager { return wwm ?: error("Expected non-null windowless window manager") } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHostSupplier.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHostSupplier.kt index 27ffd6cd8076..7821619e61d7 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHostSupplier.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/DefaultWindowDecorViewHostSupplier.kt @@ -24,14 +24,15 @@ import kotlinx.coroutines.CoroutineScope /** * A supplier of [DefaultWindowDecorViewHost]s. It creates a new one every time one is requested. */ -class DefaultWindowDecorViewHostSupplier(@ShellMainThread private val mainScope: CoroutineScope) : - WindowDecorViewHostSupplier<DefaultWindowDecorViewHost> { +class DefaultWindowDecorViewHostSupplier( + @ShellMainThread private val mainScope: CoroutineScope +) : WindowDecorViewHostSupplier<WindowDecorViewHost> { - override fun acquire(context: Context, display: Display): DefaultWindowDecorViewHost { + override fun acquire(context: Context, display: Display): WindowDecorViewHost { return DefaultWindowDecorViewHost(context, mainScope, display) } - override fun release(viewHost: DefaultWindowDecorViewHost, t: SurfaceControl.Transaction) { + override fun release(viewHost: WindowDecorViewHost, t: SurfaceControl.Transaction) { viewHost.release(t) } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/WindowDecorViewHost.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/WindowDecorViewHost.kt index 7c1479e9f9bd..2dcbbac4646f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/WindowDecorViewHost.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/WindowDecorViewHost.kt @@ -16,6 +16,7 @@ package com.android.wm.shell.windowdecor.common.viewhost import android.content.res.Configuration +import android.graphics.Region import android.view.SurfaceControl import android.view.View import android.view.WindowManager @@ -34,11 +35,17 @@ interface WindowDecorViewHost { view: View, attrs: WindowManager.LayoutParams, configuration: Configuration, - onDrawTransaction: SurfaceControl.Transaction?, + touchableRegion: Region? = null, + onDrawTransaction: SurfaceControl.Transaction? = null, ) /** Asynchronously update the view hierarchy of this view host. */ - fun updateViewAsync(view: View, attrs: WindowManager.LayoutParams, configuration: Configuration) + fun updateViewAsync( + view: View, + attrs: WindowManager.LayoutParams, + configuration: Configuration, + touchableRegion: Region? = null, + ) /** Releases the underlying [View] hierarchy and removes the backing [SurfaceControl]. */ fun release(t: SurfaceControl.Transaction) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/WindowDecorWindowlessWindowManager.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/WindowDecorWindowlessWindowManager.kt new file mode 100644 index 000000000000..fbe8c6c83b5c --- /dev/null +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/common/viewhost/WindowDecorWindowlessWindowManager.kt @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.wm.shell.windowdecor.common.viewhost + +import android.content.res.Configuration +import android.graphics.Region +import android.view.SurfaceControl +import android.view.SurfaceControlViewHost +import android.view.WindowlessWindowManager + +/** + * A [WindowlessWindowManager] for the window decor caption that allows customizing the touchable + * region. + */ +class WindowDecorWindowlessWindowManager( + configuration: Configuration, + rootSurface: SurfaceControl, +) : WindowlessWindowManager(configuration, rootSurface, /* hostInputTransferToken= */ null) { + + /** Set the view host's touchable region. */ + fun setTouchRegion(viewHost: SurfaceControlViewHost, region: Region?) { + setTouchRegion(viewHost.windowToken.asBinder(), region) + } +} diff --git a/libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt b/libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt index f6d2cc09d7b0..f4f60d73c25c 100644 --- a/libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt +++ b/libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt @@ -272,9 +272,11 @@ class DesktopModeFlickerScenarios { TaggedCujTransitionMatcher(associatedTransitionRequired = false) ) .build(), - assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS + - listOf(AppWindowCoversLeftHalfScreenAtEnd(DESKTOP_MODE_APP)) - .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }), + assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS + listOf( + AppWindowCoversLeftHalfScreenAtEnd( + DESKTOP_MODE_APP, SNAP_WINDOW_MAX_DIFF_THRESHOLD_RATIO + ) + ).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }), ) val SNAP_RESIZE_RIGHT_WITH_DRAG = @@ -287,9 +289,11 @@ class DesktopModeFlickerScenarios { TaggedCujTransitionMatcher(associatedTransitionRequired = false) ) .build(), - assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS + - listOf(AppWindowCoversRightHalfScreenAtEnd(DESKTOP_MODE_APP)) - .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }), + assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS + listOf( + AppWindowCoversRightHalfScreenAtEnd( + DESKTOP_MODE_APP, SNAP_WINDOW_MAX_DIFF_THRESHOLD_RATIO + ) + ).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }), ) val SNAP_RESIZE_WITH_DRAG_NON_RESIZABLE = diff --git a/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromAnotherApp.kt b/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromAnotherApp.kt index 2ccffa85b5c1..a3d60207a8bd 100644 --- a/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromAnotherApp.kt +++ b/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromAnotherApp.kt @@ -66,5 +66,6 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { fun teardown() { primaryApp.exit(wmHelper) secondaryApp.exit(wmHelper) + Utils.resetFreezeRecentTaskList() } } diff --git a/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromHome.kt b/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromHome.kt index 8673c464ad19..9c7de05563e1 100644 --- a/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromHome.kt +++ b/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromHome.kt @@ -65,5 +65,6 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { fun teardown() { primaryApp.exit(wmHelper) secondaryApp.exit(wmHelper) + Utils.resetFreezeRecentTaskList() } } diff --git a/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromRecent.kt b/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromRecent.kt index 22adf6c9ee2f..9eb29723cc7d 100644 --- a/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromRecent.kt +++ b/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBackToSplitFromRecent.kt @@ -68,5 +68,6 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { fun teardown() { primaryApp.exit(wmHelper) secondaryApp.exit(wmHelper) + Utils.resetFreezeRecentTaskList() } } diff --git a/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBetweenSplitPairs.kt b/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBetweenSplitPairs.kt index 4ded148f6113..d833d91c0b4b 100644 --- a/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBetweenSplitPairs.kt +++ b/libs/WindowManager/Shell/tests/e2e/splitscreen/scenarios/src/com/android/wm/shell/scenarios/SwitchBetweenSplitPairs.kt @@ -68,5 +68,6 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) { secondaryApp.exit(wmHelper) thirdApp.exit(wmHelper) fourthApp.exit(wmHelper) + Utils.resetFreezeRecentTaskList() } } diff --git a/libs/WindowManager/Shell/tests/e2e/utils/src/com/android/wm/shell/Utils.kt b/libs/WindowManager/Shell/tests/e2e/utils/src/com/android/wm/shell/Utils.kt index c0fafef96775..4a9e73b4af58 100644 --- a/libs/WindowManager/Shell/tests/e2e/utils/src/com/android/wm/shell/Utils.kt +++ b/libs/WindowManager/Shell/tests/e2e/utils/src/com/android/wm/shell/Utils.kt @@ -28,7 +28,10 @@ import android.tools.flicker.rules.ArtifactSaverRule import android.tools.flicker.rules.ChangeDisplayOrientationRule import android.tools.flicker.rules.LaunchAppRule import android.tools.flicker.rules.RemoveAllTasksButHomeRule +import android.util.Log import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.uiautomator.UiDevice +import java.io.IOException import org.junit.rules.RuleChain object Utils { @@ -52,4 +55,17 @@ object Utils { .around(PressHomeRule()) .around(EnsureDeviceSettingsRule()) } + + /** + * Resets the frozen recent tasks list (ie. commits the quickswitch to the current task and + * reorders the current task to the end of the recents list). + */ + fun resetFreezeRecentTaskList() { + try { + UiDevice.getInstance(instrumentation) + .executeShellCommand("wm reset-freeze-recent-tasks") + } catch (e: IOException) { + Log.e("TestUtils", "Failed to reset frozen recent tasks list", e) + } + } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java index c3e396524da1..f22e2a591df3 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java @@ -86,7 +86,6 @@ import com.android.internal.util.test.FakeSettingsProvider; import com.android.wm.shell.RootTaskDisplayAreaOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.TestShellExecutor; -import com.android.wm.shell.shared.ShellSharedConstants; import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; @@ -254,7 +253,7 @@ public class BackAnimationControllerTest extends ShellTestCase { @Test public void instantiateController_addExternalInterface() { verify(mShellController, times(1)).addExternalInterface( - eq(ShellSharedConstants.KEY_EXTRA_SHELL_BACK_ANIMATION), any(), any()); + eq(IBackAnimation.DESCRIPTOR), any(), any()); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxConfigurationTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxConfigurationTest.kt index 75025d9064d3..1399600d5ab9 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxConfigurationTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxConfigurationTest.kt @@ -26,6 +26,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn import com.android.internal.R import com.android.wm.shell.ShellTestCase import java.util.function.Consumer +import kotlin.test.assertEquals import org.junit.Test import org.junit.runner.RunWith import org.mockito.kotlin.doReturn @@ -51,6 +52,14 @@ class LetterboxConfigurationTest : ShellTestCase() { val COLOR_WHITE_RESOURCE_ID = android.R.color.white @JvmStatic val COLOR_BLACK_RESOURCE_ID = android.R.color.black + @JvmStatic + val ROUNDED_CORNER_RADIUS_DEFAULT = 32 + @JvmStatic + val ROUNDED_CORNER_RADIUS_VALID = 16 + @JvmStatic + val ROUNDED_CORNER_RADIUS_NONE = 0 + @JvmStatic + val ROUNDED_CORNER_RADIUS_INVALID = -10 } @Test @@ -112,6 +121,68 @@ class LetterboxConfigurationTest : ShellTestCase() { } } + @Test + fun `default rounded corner radius is used if override is not set`() { + runTestScenario { r -> + r.setDefaultRoundedCornerRadius(ROUNDED_CORNER_RADIUS_DEFAULT) + r.loadConfiguration() + r.checkRoundedCornersRadius(ROUNDED_CORNER_RADIUS_DEFAULT) + } + } + + @Test + fun `new rounded corner radius is used after setting a valid value`() { + runTestScenario { r -> + r.setDefaultRoundedCornerRadius(ROUNDED_CORNER_RADIUS_DEFAULT) + r.loadConfiguration() + r.overrideRoundedCornersRadius(ROUNDED_CORNER_RADIUS_VALID) + r.checkRoundedCornersRadius(ROUNDED_CORNER_RADIUS_VALID) + } + } + + @Test + fun `no rounded corner radius is used after setting an invalid value`() { + runTestScenario { r -> + r.setDefaultRoundedCornerRadius(ROUNDED_CORNER_RADIUS_DEFAULT) + r.loadConfiguration() + r.overrideRoundedCornersRadius(ROUNDED_CORNER_RADIUS_INVALID) + r.checkRoundedCornersRadius(ROUNDED_CORNER_RADIUS_NONE) + } + } + + @Test + fun `has rounded corners for different values`() { + runTestScenario { r -> + r.setDefaultRoundedCornerRadius(ROUNDED_CORNER_RADIUS_DEFAULT) + r.loadConfiguration() + r.checkIsLetterboxActivityCornersRounded(true) + + r.overrideRoundedCornersRadius(ROUNDED_CORNER_RADIUS_INVALID) + r.checkIsLetterboxActivityCornersRounded(false) + + r.overrideRoundedCornersRadius(ROUNDED_CORNER_RADIUS_NONE) + r.checkIsLetterboxActivityCornersRounded(false) + + r.overrideRoundedCornersRadius(ROUNDED_CORNER_RADIUS_VALID) + r.checkIsLetterboxActivityCornersRounded(true) + } + } + + @Test + fun `reset rounded corners radius`() { + runTestScenario { r -> + r.setDefaultRoundedCornerRadius(ROUNDED_CORNER_RADIUS_DEFAULT) + r.loadConfiguration() + r.checkRoundedCornersRadius(ROUNDED_CORNER_RADIUS_DEFAULT) + + r.overrideRoundedCornersRadius(ROUNDED_CORNER_RADIUS_VALID) + r.checkRoundedCornersRadius(ROUNDED_CORNER_RADIUS_VALID) + + r.resetRoundedCornersRadius() + r.checkRoundedCornersRadius(ROUNDED_CORNER_RADIUS_DEFAULT) + } + } + /** * Runs a test scenario providing a Robot. */ @@ -135,6 +206,11 @@ class LetterboxConfigurationTest : ShellTestCase() { .getColor(R.color.config_letterboxBackgroundColor, null) } + fun setDefaultRoundedCornerRadius(radius: Int) { + doReturn(radius).`when`(resources) + .getInteger(R.integer.config_letterboxActivityCornersRadius) + } + fun loadConfiguration() { letterboxConfig = LetterboxConfiguration(ctx) } @@ -147,14 +223,30 @@ class LetterboxConfigurationTest : ShellTestCase() { letterboxConfig.resetLetterboxBackgroundColor() } + fun resetRoundedCornersRadius() { + letterboxConfig.resetLetterboxActivityCornersRadius() + } + fun overrideBackgroundColorId(@ColorRes colorId: Int) { letterboxConfig.setLetterboxBackgroundColorResourceId(colorId) } + fun overrideRoundedCornersRadius(radius: Int) { + letterboxConfig.setLetterboxActivityCornersRadius(radius) + } + fun checkBackgroundColor(expected: Color) { val colorComponents = letterboxConfig.getBackgroundColorRgbArray() val expectedComponents = expected.components assert(expectedComponents.contentEquals(colorComponents)) } + + fun checkRoundedCornersRadius(expected: Int) { + assertEquals(expected, letterboxConfig.getLetterboxActivityCornersRadius()) + } + + fun checkIsLetterboxActivityCornersRounded(expected: Boolean) { + assertEquals(expected, letterboxConfig.isLetterboxActivityCornersRounded()) + } } } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxControllerRobotTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxControllerRobotTest.kt index f9f01bcd54f3..95a0c82c76df 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxControllerRobotTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxControllerRobotTest.kt @@ -98,6 +98,10 @@ open class LetterboxControllerRobotTest( activityBounds = activityBounds ) + fun invokeDump() { + letterboxController.dump() + } + fun checkSurfaceBuilderInvoked(times: Int = 1, name: String = "", callSite: String = "") { verify(surfaceBuilder, times(times)).createSurface( eq(transaction), diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserverTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserverTest.kt index 8825bb4956b2..78bb721d1028 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserverTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxTransitionObserverTest.kt @@ -96,6 +96,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() { validateOutput { r.creationEventDetected(expected = false) + r.configureStrategyInvoked(expected = false) r.visibilityEventDetected(expected = false) r.destroyEventDetected(expected = false) r.updateSurfaceBoundsEventDetected(expected = false) @@ -123,6 +124,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() { validateOutput { r.creationEventDetected(expected = true) + r.configureStrategyInvoked(expected = true) r.visibilityEventDetected(expected = true, visible = true) r.destroyEventDetected(expected = false) r.updateSurfaceBoundsEventDetected( @@ -217,6 +219,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() { private val letterboxController: LetterboxController private val letterboxObserver: LetterboxTransitionObserver private val transitionStateHolder: TransitionStateHolder + private val letterboxStrategy: LetterboxControllerStrategy val observerFactory: () -> LetterboxTransitionObserver @@ -225,6 +228,7 @@ class LetterboxTransitionObserverTest : ShellTestCase() { shellInit = ShellInit(executor) transitions = mock<Transitions>() letterboxController = mock<LetterboxController>() + letterboxStrategy = mock<LetterboxControllerStrategy>() transitionStateHolder = TransitionStateHolder(shellInit, mock<RecentsTransitionHandler>()) spyOn(transitionStateHolder) @@ -233,7 +237,8 @@ class LetterboxTransitionObserverTest : ShellTestCase() { shellInit, transitions, letterboxController, - transitionStateHolder + transitionStateHolder, + letterboxStrategy ) observerFactory = { letterboxObserver } } @@ -302,6 +307,9 @@ class LetterboxTransitionObserverTest : ShellTestCase() { eq(activityBounds) ) + fun configureStrategyInvoked(expected: Boolean) = + verify(letterboxStrategy, expected.asMode()).configureLetterboxMode() + fun createTopActivityChange( inputBuilder: TransitionObserverInputBuilder, isLetterboxed: Boolean = true, diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxUtilsTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxUtilsTest.kt new file mode 100644 index 000000000000..06b805233ee7 --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/LetterboxUtilsTest.kt @@ -0,0 +1,151 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.letterbox + +import android.content.Context +import android.graphics.Rect +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.wm.shell.ShellTestCase +import java.util.function.Consumer +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify + +/** + * Tests for [LetterboxUtils]. + * + * Build/Install/Run: + * atest WMShellUnitTests:LetterboxUtilsTest + */ +@RunWith(AndroidTestingRunner::class) +@SmallTest +class LetterboxUtilsTest : ShellTestCase() { + + val firstLetterboxController = mock<LetterboxController>() + val secondLetterboxController = mock<LetterboxController>() + val thirdLetterboxController = mock<LetterboxController>() + + private val letterboxControllerBuilder: (LetterboxSurfaceBuilder) -> LetterboxController = + { _ -> + firstLetterboxController.append(secondLetterboxController) + .append(thirdLetterboxController) + } + + @Test + fun `Appended LetterboxController invoked creation on all the controllers`() { + runTestScenario { r -> + r.sendCreateSurfaceRequest() + + r.verifyCreateSurfaceInvokedWithRequest(target = firstLetterboxController) + r.verifyCreateSurfaceInvokedWithRequest(target = secondLetterboxController) + r.verifyCreateSurfaceInvokedWithRequest(target = thirdLetterboxController) + } + } + + @Test + fun `Appended LetterboxController invoked destroy on all the controllers`() { + runTestScenario { r -> + r.sendDestroySurfaceRequest() + r.verifyDestroySurfaceInvokedWithRequest(target = firstLetterboxController) + r.verifyDestroySurfaceInvokedWithRequest(target = secondLetterboxController) + r.verifyDestroySurfaceInvokedWithRequest(target = thirdLetterboxController) + } + } + + @Test + fun `Appended LetterboxController invoked update visibility on all the controllers`() { + runTestScenario { r -> + r.sendUpdateSurfaceVisibilityRequest(visible = true) + r.verifyUpdateVisibilitySurfaceInvokedWithRequest(target = firstLetterboxController) + r.verifyUpdateVisibilitySurfaceInvokedWithRequest(target = secondLetterboxController) + r.verifyUpdateVisibilitySurfaceInvokedWithRequest(target = thirdLetterboxController) + } + } + + @Test + fun `Appended LetterboxController invoked update bounds on all the controllers`() { + runTestScenario { r -> + r.sendUpdateSurfaceBoundsRequest(taskBounds = Rect(), activityBounds = Rect()) + r.verifyUpdateSurfaceBoundsInvokedWithRequest(target = firstLetterboxController) + r.verifyUpdateSurfaceBoundsInvokedWithRequest(target = secondLetterboxController) + r.verifyUpdateSurfaceBoundsInvokedWithRequest(target = thirdLetterboxController) + } + } + + @Test + fun `Appended LetterboxController invoked update dump on all the controllers`() { + runTestScenario { r -> + r.invokeDump() + r.verifyDumpInvoked(target = firstLetterboxController) + r.verifyDumpInvoked(target = secondLetterboxController) + r.verifyDumpInvoked(target = thirdLetterboxController) + } + } + + /** + * Runs a test scenario providing a Robot. + */ + fun runTestScenario(consumer: Consumer<AppendLetterboxControllerRobotTest>) { + val robot = AppendLetterboxControllerRobotTest(mContext, letterboxControllerBuilder) + consumer.accept(robot) + } + + class AppendLetterboxControllerRobotTest( + ctx: Context, + builder: (LetterboxSurfaceBuilder) -> LetterboxController + ) : LetterboxControllerRobotTest(ctx, builder) { + + fun verifyCreateSurfaceInvokedWithRequest( + target: LetterboxController, + times: Int = 1 + ) { + verify(target, times(times)).createLetterboxSurface(any(), any(), any()) + } + + fun verifyDestroySurfaceInvokedWithRequest( + target: LetterboxController, + times: Int = 1 + ) { + verify(target, times(times)).destroyLetterboxSurface(any(), any()) + } + + fun verifyUpdateVisibilitySurfaceInvokedWithRequest( + target: LetterboxController, + times: Int = 1 + ) { + verify(target, times(times)).updateLetterboxSurfaceVisibility(any(), any(), any()) + } + + fun verifyUpdateSurfaceBoundsInvokedWithRequest( + target: LetterboxController, + times: Int = 1 + ) { + verify(target, times(times)).updateLetterboxSurfaceBounds(any(), any(), any(), any()) + } + + fun verifyDumpInvoked( + target: LetterboxController, + times: Int = 1 + ) { + verify(target, times(times)).dump() + } + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/MixedLetterboxControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/MixedLetterboxControllerTest.kt new file mode 100644 index 000000000000..e6bff4c1ec15 --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/MixedLetterboxControllerTest.kt @@ -0,0 +1,128 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.compatui.letterbox + +import android.content.Context +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.wm.shell.ShellTestCase +import com.android.wm.shell.compatui.letterbox.LetterboxControllerStrategy.LetterboxMode +import java.util.function.Consumer +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.times +import org.mockito.kotlin.verify + +/** + * Tests for [MixedLetterboxController]. + * + * Build/Install/Run: + * atest WMShellUnitTests:MixedLetterboxControllerTest + */ +@RunWith(AndroidTestingRunner::class) +@SmallTest +class MixedLetterboxControllerTest : ShellTestCase() { + + @Test + fun `When strategy is SINGLE_SURFACE and a create request is sent multi are destroyed`() { + runTestScenario { r -> + r.configureStrategyFor(LetterboxMode.SINGLE_SURFACE) + r.sendCreateSurfaceRequest() + r.checkCreateInvokedOnSingleController() + r.checkDestroyInvokedOnMultiController() + } + } + + @Test + fun `When strategy is MULTIPLE_SURFACES and a create request is sent single is destroyed`() { + runTestScenario { r -> + r.configureStrategyFor(LetterboxMode.MULTIPLE_SURFACES) + r.sendCreateSurfaceRequest() + r.checkDestroyInvokedOnSingleController() + r.checkCreateInvokedOnMultiController() + } + } + + /** + * Runs a test scenario providing a Robot. + */ + fun runTestScenario(consumer: Consumer<MixedLetterboxControllerRobotTest>) { + val robot = MixedLetterboxControllerRobotTest(mContext, ObjectToTestHolder()) + consumer.accept(robot) + } + + class MixedLetterboxControllerRobotTest( + ctx: Context, + private val objectToTestHolder: ObjectToTestHolder + ) : LetterboxControllerRobotTest(ctx, objectToTestHolder.controllerBuilder) { + + fun configureStrategyFor(letterboxMode: LetterboxMode) { + doReturn(letterboxMode).`when`(objectToTestHolder.controllerStrategy) + .getLetterboxImplementationMode() + } + + fun checkCreateInvokedOnSingleController(times: Int = 1) { + verify( + objectToTestHolder.singleLetterboxController, + times(times) + ).createLetterboxSurface(any(), any(), any()) + } + + fun checkCreateInvokedOnMultiController(times: Int = 1) { + verify( + objectToTestHolder.multipleLetterboxController, + times(times) + ).createLetterboxSurface(any(), any(), any()) + } + + fun checkDestroyInvokedOnSingleController(times: Int = 1) { + verify( + objectToTestHolder.singleLetterboxController, + times(times) + ).destroyLetterboxSurface(any(), any()) + } + + fun checkDestroyInvokedOnMultiController(times: Int = 1) { + verify( + objectToTestHolder.multipleLetterboxController, + times(times) + ).destroyLetterboxSurface(any(), any()) + } + } + + data class ObjectToTestHolder( + val singleLetterboxController: SingleSurfaceLetterboxController = + mock<SingleSurfaceLetterboxController>(), + val multipleLetterboxController: MultiSurfaceLetterboxController = + mock<MultiSurfaceLetterboxController>(), + val controllerStrategy: LetterboxControllerStrategy = mock<LetterboxControllerStrategy>() + ) { + + private val mixedController = + MixedLetterboxController( + singleLetterboxController, + multipleLetterboxController, + controllerStrategy + ) + + val controllerBuilder: (LetterboxSurfaceBuilder) -> LetterboxController = + { _ -> mixedController } + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt index dc7fb5f36952..e57ae2a86859 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt @@ -56,6 +56,7 @@ import com.android.window.flags.Flags.FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCU 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.desktopmode.common.ToggleTaskSizeInteraction import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.android.wm.shell.sysui.ShellInit import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel @@ -182,6 +183,7 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() verify(desktopTasksController).moveToNextDisplay(task.taskId) @@ -204,9 +206,15 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() - assertThat(testExecutor.callbacks.size).isEqualTo(1) + verify(desktopModeWindowDecorViewModel).onSnapResize( + task.taskId, + true, + DesktopModeEventLogger.Companion.InputMethod.KEYBOARD, + /* fromMenu= */ false + ) } @Test @@ -226,9 +234,15 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() - assertThat(testExecutor.callbacks.size).isEqualTo(1) + verify(desktopModeWindowDecorViewModel).onSnapResize( + task.taskId, + false, + DesktopModeEventLogger.Companion.InputMethod.KEYBOARD, + /* fromMenu= */ false + ) } @Test @@ -248,9 +262,18 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() - assertThat(testExecutor.callbacks.size).isEqualTo(1) + verify(desktopTasksController).toggleDesktopTaskSize( + task, + ToggleTaskSizeInteraction( + isMaximized = isTaskMaximized(task, displayController), + source = ToggleTaskSizeInteraction.Source.KEYBOARD_SHORTCUT, + inputMethod = + DesktopModeEventLogger.Companion.InputMethod.KEYBOARD, + ), + ) } @Test @@ -270,9 +293,10 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() - assertThat(testExecutor.callbacks.size).isEqualTo(1) + verify(desktopTasksController).minimizeTask(task) } private fun setUpFreeformTask( diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt index 9059d7d5342c..344140d91ab3 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopRepositoryTest.kt @@ -149,6 +149,14 @@ class DesktopRepositoryTest : ShellTestCase() { } @Test + fun addTask_multipleDisplays_moveToAnotherDisplay() { + repo.addTask(DEFAULT_DISPLAY, taskId = 1, isVisible = true) + repo.addTask(SECOND_DISPLAY, taskId = 1, isVisible = true) + assertThat(repo.getFreeformTasksInZOrder(DEFAULT_DISPLAY)).isEmpty() + assertThat(repo.getFreeformTasksInZOrder(SECOND_DISPLAY)).containsExactly(1) + } + + @Test fun removeActiveTask_notifiesActiveTaskListener() { val listener = TestListener() repo.addActiveTaskListener(listener) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt index c10434aa6d6f..8e210719dbd0 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTasksControllerTest.kt @@ -3305,44 +3305,41 @@ class DesktopTasksControllerTest : ShellTestCase() { setUpLandscapeDisplay() val task = setUpFreeformTask() val taskToRequest = setUpFreeformTask() - val wctCaptor = ArgumentCaptor.forClass(WindowContainerTransaction::class.java) runOpenInstance(task, taskToRequest.taskId) - verify(transitions).startTransition(anyInt(), wctCaptor.capture(), anyOrNull()) - assertThat(ActivityOptions.fromBundle(wctCaptor.value.hierarchyOps[0].launchOptions) - .launchWindowingMode).isEqualTo(WINDOWING_MODE_FREEFORM) + verify(desktopMixedTransitionHandler).startLaunchTransition(anyInt(), any(), anyInt(), + anyOrNull(), anyOrNull()) + val wct = getLatestDesktopMixedTaskWct(type = TRANSIT_TO_FRONT) + assertThat(wct.hierarchyOps).hasSize(1) + wct.assertReorderAt(index = 0, taskToRequest) } @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES) fun openInstance_fromFreeform_minimizesIfNeeded() { setUpLandscapeDisplay() - val homeTask = setUpHomeTask() val freeformTasks = (1..MAX_TASK_LIMIT + 1).map { _ -> setUpFreeformTask() } val oldestTask = freeformTasks.first() val newestTask = freeformTasks.last() + val transition = Binder() + val wctCaptor = argumentCaptor<WindowContainerTransaction>() + whenever(desktopMixedTransitionHandler.startLaunchTransition(anyInt(), wctCaptor.capture(), + anyInt(), anyOrNull(), anyOrNull() + )) + .thenReturn(transition) + runOpenInstance(newestTask, freeformTasks[1].taskId) - val wct = getLatestWct(type = TRANSIT_OPEN) - // Home is moved to front of everything. - assertThat( - wct.hierarchyOps.any { hop -> - hop.container == homeTask.token.asBinder() && hop.toTop - } - ).isTrue() - // And the oldest task isn't moved in front of home, effectively minimizing it. - assertThat( - wct.hierarchyOps.none { hop -> - hop.container == oldestTask.token.asBinder() && hop.toTop - } - ).isTrue() + val wct = wctCaptor.firstValue + assertThat(wct.hierarchyOps.size).isEqualTo(2) // move-to-front + minimize + wct.assertReorderAt(0, freeformTasks[1], toTop = true) + wct.assertReorderAt(1, oldestTask, toTop = false) } @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MULTI_INSTANCE_FEATURES) fun openInstance_fromFreeform_exitsImmersiveIfNeeded() { setUpLandscapeDisplay() - val homeTask = setUpHomeTask() val freeformTask = setUpFreeformTask() val immersiveTask = setUpFreeformTask() taskRepository.setTaskInFullImmersiveState( @@ -3352,11 +3349,13 @@ class DesktopTasksControllerTest : ShellTestCase() { ) val runOnStartTransit = RunOnStartTransitionCallback() val transition = Binder() - whenever(transitions.startTransition(eq(TRANSIT_OPEN), any(), anyOrNull())) + whenever(desktopMixedTransitionHandler.startLaunchTransition(anyInt(), any(), anyInt(), + anyOrNull(), anyOrNull() + )) .thenReturn(transition) whenever(mMockDesktopImmersiveController .exitImmersiveIfApplicable( - any(), eq(immersiveTask.displayId), eq(freeformTask.taskId), any())) + any(), eq(DEFAULT_DISPLAY), eq(freeformTask.taskId), any())) .thenReturn( ExitResult.Exit( exitingTask = immersiveTask.taskId, diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopUserRepositoriesTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopUserRepositoriesTest.kt new file mode 100644 index 000000000000..5767df4c5a8e --- /dev/null +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopUserRepositoriesTest.kt @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.wm.shell.desktopmode + +import android.app.ActivityManager +import android.content.pm.UserInfo +import android.os.UserManager +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.SetFlagsRule +import android.testing.AndroidTestingRunner +import androidx.test.filters.SmallTest +import com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession +import com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn +import com.android.dx.mockito.inline.extended.StaticMockitoSession +import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_HSUM +import com.android.wm.shell.ShellTestCase +import com.android.wm.shell.common.ShellExecutor +import com.android.wm.shell.desktopmode.persistence.DesktopPersistentRepository +import com.android.wm.shell.desktopmode.persistence.DesktopRepositoryInitializer +import com.android.wm.shell.sysui.ShellInit +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.SupervisorJob +import kotlinx.coroutines.cancel +import kotlinx.coroutines.test.StandardTestDispatcher +import kotlinx.coroutines.test.setMain +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Mockito.spy +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever +import org.mockito.quality.Strictness + +@SmallTest +@RunWith(AndroidTestingRunner::class) +@ExperimentalCoroutinesApi +class DesktopUserRepositoriesTest : ShellTestCase() { + @get:Rule val setFlagsRule = SetFlagsRule() + + private lateinit var userRepositories: DesktopUserRepositories + private lateinit var shellInit: ShellInit + private lateinit var datastoreScope: CoroutineScope + private lateinit var mockitoSession: StaticMockitoSession + + private val testExecutor = mock<ShellExecutor>() + private val persistentRepository = mock<DesktopPersistentRepository>() + private val repositoryInitializer = mock<DesktopRepositoryInitializer>() + private val userManager = mock<UserManager>() + + @Before + fun setUp() { + Dispatchers.setMain(StandardTestDispatcher()) + mockitoSession = + mockitoSession() + .strictness(Strictness.LENIENT) + .spyStatic(ActivityManager::class.java) + .startMocking() + doReturn(USER_ID_1).`when` { ActivityManager.getCurrentUser() } + + datastoreScope = CoroutineScope(Dispatchers.Unconfined + SupervisorJob()) + shellInit = spy(ShellInit(testExecutor)) + + val profiles: MutableList<UserInfo> = mutableListOf( + UserInfo(USER_ID_1, "User 1", 0), + UserInfo(PROFILE_ID_2, "Profile 2", 0)) + whenever(userManager.getProfiles(USER_ID_1)).thenReturn(profiles) + + userRepositories = DesktopUserRepositories( + context, shellInit, persistentRepository, repositoryInitializer, datastoreScope, + userManager) + } + + @After + fun tearDown() { + mockitoSession.finishMocking() + datastoreScope.cancel() + } + + @Test + fun getCurrent_returnsUserId() { + val desktopRepository: DesktopRepository = userRepositories.current + + assertThat(desktopRepository.userId).isEqualTo(USER_ID_1) + } + + @Test + @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_HSUM) + fun getProfile_flagEnabled_returnsProfileGroupId() { + val desktopRepository: DesktopRepository = userRepositories.getProfile(PROFILE_ID_2) + + assertThat(desktopRepository.userId).isEqualTo(USER_ID_1) + } + + @Test + @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_HSUM) + fun getProfile_flagDisabled_returnsProfileId() { + val desktopRepository: DesktopRepository = userRepositories.getProfile(PROFILE_ID_2) + + assertThat(desktopRepository.userId).isEqualTo(PROFILE_ID_2) + } + + private companion object { + const val USER_ID_1 = 7 + const val PROFILE_ID_2 = 5 + } +} diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedControllerTest.java index 7d063a0a773f..256ed413c2cf 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/onehanded/OneHandedControllerTest.java @@ -48,7 +48,6 @@ import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.TaskStackListenerImpl; -import com.android.wm.shell.shared.ShellSharedConstants; import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; @@ -179,7 +178,7 @@ public class OneHandedControllerTest extends OneHandedTestCase { @Test public void testControllerRegisteresExternalInterface() { verify(mMockShellController, times(1)).addExternalInterface( - eq(ShellSharedConstants.KEY_EXTRA_SHELL_ONE_HANDED), any(), any()); + eq(IOneHanded.DESCRIPTOR), any(), any()); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java index b123f4dfac9e..5ef934ce8394 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/phone/PipControllerTest.java @@ -58,6 +58,7 @@ import com.android.wm.shell.common.DisplayLayout; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.TabletopModeController; import com.android.wm.shell.common.TaskStackListenerImpl; +import com.android.wm.shell.common.pip.IPip; import com.android.wm.shell.common.pip.PhonePipKeepClearAlgorithm; import com.android.wm.shell.common.pip.PipAppOpsListener; import com.android.wm.shell.common.pip.PipBoundsAlgorithm; @@ -71,7 +72,6 @@ import com.android.wm.shell.pip.PipParamsChangedForwarder; import com.android.wm.shell.pip.PipTaskOrganizer; import com.android.wm.shell.pip.PipTransitionController; import com.android.wm.shell.pip.PipTransitionState; -import com.android.wm.shell.shared.ShellSharedConstants; import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; @@ -178,7 +178,7 @@ public class PipControllerTest extends ShellTestCase { @Test public void instantiatePipController_registerExternalInterface() { verify(mShellController, times(1)).addExternalInterface( - eq(ShellSharedConstants.KEY_EXTRA_SHELL_PIP), any(), eq(mPipController)); + eq(IPip.DESCRIPTOR), any(), eq(mPipController)); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java index 95f371f7000a..c6835b7bde55 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java @@ -26,8 +26,6 @@ import static com.android.launcher3.Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL; import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE; import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50; -import static com.google.common.truth.Truth.assertThat; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -59,7 +57,6 @@ import android.content.pm.PackageManager; import android.graphics.Point; import android.graphics.Rect; import android.os.Bundle; -import android.os.UserManager; import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; import android.platform.test.flag.junit.SetFlagsRule; @@ -80,7 +77,6 @@ import com.android.wm.shell.desktopmode.DesktopRepository; import com.android.wm.shell.desktopmode.DesktopUserRepositories; import com.android.wm.shell.desktopmode.DesktopWallpaperActivity; import com.android.wm.shell.shared.GroupedTaskInfo; -import com.android.wm.shell.shared.ShellSharedConstants; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.shared.split.SplitBounds; import com.android.wm.shell.sysui.ShellCommandHandler; @@ -186,7 +182,7 @@ public class RecentTasksControllerTest extends ShellTestCase { @Test public void instantiateController_addExternalInterface() { verify(mShellController, times(1)).addExternalInterface( - eq(ShellSharedConstants.KEY_EXTRA_SHELL_RECENT_TASKS), any(), any()); + eq(IRecentTasks.DESCRIPTOR), any(), any()); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java index 7726c97b0ce3..bb9703fce2e3 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitScreenControllerTests.java @@ -75,7 +75,6 @@ import com.android.wm.shell.common.split.SplitState; import com.android.wm.shell.desktopmode.DesktopTasksController; import com.android.wm.shell.draganddrop.DragAndDropController; import com.android.wm.shell.recents.RecentTasksController; -import com.android.wm.shell.shared.ShellSharedConstants; import com.android.wm.shell.shared.TransactionPool; import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; @@ -180,7 +179,7 @@ public class SplitScreenControllerTests extends ShellTestCase { when(mDisplayController.getDisplayLayout(anyInt())).thenReturn(new DisplayLayout()); mSplitScreenController.onInit(); verify(mShellController, times(1)).addExternalInterface( - eq(ShellSharedConstants.KEY_EXTRA_SHELL_SPLIT_SCREEN), any(), any()); + eq(ISplitScreen.DESCRIPTOR), any(), any()); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingWindowControllerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingWindowControllerTests.java index 7fd1c11e61ae..17a5f5c0f3d4 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingWindowControllerTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/startingsurface/StartingWindowControllerTests.java @@ -42,7 +42,6 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.ShellTestCase; import com.android.wm.shell.common.DisplayInsetsController; import com.android.wm.shell.common.ShellExecutor; -import com.android.wm.shell.shared.ShellSharedConstants; import com.android.wm.shell.shared.TransactionPool; import com.android.wm.shell.sysui.ShellCommandHandler; import com.android.wm.shell.sysui.ShellController; @@ -99,7 +98,7 @@ public class StartingWindowControllerTests extends ShellTestCase { @Test public void instantiateController_addExternalInterface() { verify(mShellController, times(1)).addExternalInterface( - eq(ShellSharedConstants.KEY_EXTRA_SHELL_STARTING_WINDOW), any(), any()); + eq(IStartingWindow.DESCRIPTOR), any(), any()); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java index 2442a55d78d0..dd645fd968e4 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/transition/ShellTransitionTests.java @@ -110,7 +110,7 @@ import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.recents.IRecentsAnimationRunner; import com.android.wm.shell.recents.RecentTasksController; import com.android.wm.shell.recents.RecentsTransitionHandler; -import com.android.wm.shell.shared.ShellSharedConstants; +import com.android.wm.shell.shared.IShellTransitions; import com.android.wm.shell.shared.TransactionPool; import com.android.wm.shell.sysui.ShellController; import com.android.wm.shell.sysui.ShellInit; @@ -176,7 +176,7 @@ public class ShellTransitionTests extends ShellTestCase { mock(FocusTransitionObserver.class)); shellInit.init(); verify(shellController, times(1)).addExternalInterface( - eq(ShellSharedConstants.KEY_EXTRA_SHELL_SHELL_TRANSITIONS), any(), any()); + eq(IShellTransitions.DESCRIPTOR), any(), any()); } @Test diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenuTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenuTest.kt index 44035588887f..e871711fd25e 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenuTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopHeaderManageWindowsMenuTest.kt @@ -35,7 +35,6 @@ import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystem import com.google.common.truth.Truth.assertThat import org.junit.After import org.junit.Before -import org.junit.Ignore import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -77,7 +76,6 @@ class DesktopHeaderManageWindowsMenuTest : ShellTestCase() { } @Test - @Ignore("Test is failing internally") @EnableFlags(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP) fun testShow_forImmersiveTask_usesSystemViewContainer() { val task = createFreeformTask() @@ -110,6 +108,7 @@ class DesktopHeaderManageWindowsMenuTest : ShellTestCase() { .setToken(MockToken().token()) .setActivityType(ACTIVITY_TYPE_STANDARD) .setWindowingMode(WINDOWING_MODE_FREEFORM) + .setUserId(DEFAULT_USER_ID) .build() private companion object { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTestsBase.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTestsBase.kt index afd46078074c..dce44b7c829f 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTestsBase.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTestsBase.kt @@ -74,6 +74,8 @@ import com.android.wm.shell.transition.Transitions import com.android.wm.shell.util.StubTransaction import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel.DesktopModeKeyguardChangeListener import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel.DesktopModeOnInsetsChangedListener +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier import com.android.wm.shell.windowdecor.viewholder.AppHeaderViewHolder import org.junit.After import org.junit.Rule @@ -131,6 +133,8 @@ open class DesktopModeWindowDecorViewModelTestsBase : ShellTestCase() { protected val mockAssistContentRequester = mock<AssistContentRequester>() protected val bgExecutor = TestShellExecutor() protected val mockMultiInstanceHelper = mock<MultiInstanceHelper>() + private val mockWindowDecorViewHostSupplier = + mock<WindowDecorViewHostSupplier<WindowDecorViewHost>>() protected val mockTasksLimiter = mock<DesktopTasksLimiter>() protected val mockFreeformTaskTransitionStarter = mock<FreeformTaskTransitionStarter>() protected val mockActivityOrientationChangeHandler = @@ -193,6 +197,7 @@ open class DesktopModeWindowDecorViewModelTestsBase : ShellTestCase() { mockDesktopImmersiveController, mockGenericLinksParser, mockAssistContentRequester, + mockWindowDecorViewHostSupplier, mockMultiInstanceHelper, mockDesktopModeWindowDecorFactory, mockInputMonitorFactory, @@ -289,7 +294,7 @@ open class DesktopModeWindowDecorViewModelTestsBase : ShellTestCase() { whenever( mockDesktopModeWindowDecorFactory.create( any(), any(), any(), any(), any(), any(), eq(task), any(), any(), any(), any(), - any(), any(), any(), any(), any(), any(), any(), any()) + any(), any(), any(), any(), any(), any(), any(), any(), any()) ).thenReturn(decoration) decoration.mTaskInfo = task whenever(decoration.user).thenReturn(mockUserHandle) diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java index 61f3755ca772..5d5d1f220ae0 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorationTests.java @@ -29,6 +29,7 @@ import static android.view.WindowInsetsController.APPEARANCE_TRANSPARENT_CAPTION import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession; import static com.android.wm.shell.MockSurfaceControlHelper.createMockSurfaceControlTransaction; +import static com.android.wm.shell.shared.split.SplitScreenConstants.SPLIT_POSITION_BOTTOM_OR_RIGHT; import static com.android.wm.shell.windowdecor.DesktopModeWindowDecoration.CLOSE_MAXIMIZE_MENU_DELAY_MS; import static com.android.wm.shell.windowdecor.WindowDecoration.INVALID_CORNER_RADIUS; @@ -38,7 +39,6 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; @@ -50,7 +50,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.mockito.kotlin.VerificationKt.times; import android.app.ActivityManager; import android.app.assist.AssistContent; @@ -114,6 +113,8 @@ import com.android.wm.shell.desktopmode.WindowDecorCaptionHandleRepository; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.splitscreen.SplitScreenController; import com.android.wm.shell.windowdecor.WindowDecoration.RelayoutParams; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier; import com.android.wm.shell.windowdecor.viewholder.AppHeaderViewHolder; import kotlin.Unit; @@ -186,6 +187,10 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { @Mock private AttachedSurfaceControl mMockRootSurfaceControl; @Mock + private WindowDecorViewHostSupplier<WindowDecorViewHost> mMockWindowDecorViewHostSupplier; + @Mock + private WindowDecorViewHost mMockWindowDecorViewHost; + @Mock private WindowDecoration.SurfaceControlViewHostFactory mMockSurfaceControlViewHostFactory; @Mock private TypedArray mMockRoundedCornersRadiusArray; @@ -275,6 +280,9 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { any())).thenReturn(mMockAppHeaderViewHolder); when(mMockDesktopUserRepositories.getCurrent()).thenReturn(mDesktopRepository); when(mMockDesktopUserRepositories.getProfile(anyInt())).thenReturn(mDesktopRepository); + when(mMockWindowDecorViewHostSupplier.acquire(any(), eq(defaultDisplay))) + .thenReturn(mMockWindowDecorViewHost); + when(mMockWindowDecorViewHost.getSurfaceControl()).thenReturn(mock(SurfaceControl.class)); } @After @@ -305,7 +313,8 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { RelayoutParams relayoutParams = new RelayoutParams(); DesktopModeWindowDecoration.updateRelayoutParams( - relayoutParams, mContext, taskInfo, /* applyStartTransactionOnDraw= */ true, + relayoutParams, mContext, taskInfo, mMockSplitScreenController, + /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, /* isKeyguardVisibleAndOccluded */ false, @@ -325,7 +334,8 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { RelayoutParams relayoutParams = new RelayoutParams(); DesktopModeWindowDecoration.updateRelayoutParams( - relayoutParams, mContext, taskInfo, /* applyStartTransactionOnDraw= */ true, + relayoutParams, mContext, taskInfo, mMockSplitScreenController, + /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, /* isKeyguardVisibleAndOccluded */ false, @@ -344,7 +354,8 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { RelayoutParams relayoutParams = new RelayoutParams(); DesktopModeWindowDecoration.updateRelayoutParams( - relayoutParams, mContext, taskInfo, /* applyStartTransactionOnDraw= */ true, + relayoutParams, mContext, taskInfo, mMockSplitScreenController, + /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, /* isKeyguardVisibleAndOccluded */ false, @@ -367,6 +378,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -390,6 +402,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -413,6 +426,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -440,6 +454,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -468,6 +483,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -493,6 +509,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -518,6 +535,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -542,6 +560,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -566,6 +585,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -589,6 +609,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -612,6 +633,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -634,6 +656,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -657,6 +680,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -680,6 +704,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -704,6 +729,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -729,6 +755,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -752,6 +779,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -777,6 +805,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -792,6 +821,31 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { } @Test + public void updateRelayoutParams_handle_bottomSplitIsInsetSource() { + final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); + final RelayoutParams relayoutParams = new RelayoutParams(); + when(mMockSplitScreenController.isLeftRightSplit()).thenReturn(false); + when(mMockSplitScreenController.getSplitPosition(taskInfo.taskId)) + .thenReturn(SPLIT_POSITION_BOTTOM_OR_RIGHT); + + DesktopModeWindowDecoration.updateRelayoutParams( + relayoutParams, + mTestableContext, + taskInfo, + mMockSplitScreenController, + /* applyStartTransactionOnDraw= */ true, + /* shouldSetTaskPositionAndCrop */ false, + /* isStatusBarVisible */ true, + /* isKeyguardVisibleAndOccluded */ false, + /* inFullImmersiveMode */ true, + new InsetsState(), + /* hasGlobalFocus= */ true, + mExclusionRegion); + + assertThat(relayoutParams.mIsInsetSource).isTrue(); + } + + @Test @EnableFlags(Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP) public void updateRelayoutParams_header_addsPaddingInFullImmersive() { final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); @@ -808,6 +862,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -832,6 +887,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -855,6 +911,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ false, @@ -878,6 +935,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -900,6 +958,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ false, @@ -922,6 +981,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -945,6 +1005,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -960,6 +1021,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ false, @@ -983,6 +1045,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { relayoutParams, mTestableContext, taskInfo, + mMockSplitScreenController, /* applyStartTransactionOnDraw= */ true, /* shouldSetTaskPositionAndCrop */ false, /* isStatusBarVisible */ true, @@ -996,61 +1059,70 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { } @Test - public void relayout_fullscreenTask_appliesTransactionImmediately() { + public void updateRelayoutParams_handle_requestsAsyncViewHostRendering() { final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); - final DesktopModeWindowDecoration spyWindowDecor = spy(createWindowDecoration(taskInfo)); + // Make the task fullscreen so that its decoration is an App Handle. taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + final RelayoutParams relayoutParams = new RelayoutParams(); - spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); + DesktopModeWindowDecoration.updateRelayoutParams( + relayoutParams, + mTestableContext, + taskInfo, + mMockSplitScreenController, + /* applyStartTransactionOnDraw= */ true, + /* shouldSetTaskPositionAndCrop= */ false, + /* isStatusBarVisible= */ true, + /* isKeyguardVisibleAndOccluded= */ false, + /* inFullImmersiveMode= */ false, + new InsetsState(), + /* hasGlobalFocus= */ true, + mExclusionRegion); - verify(mMockTransaction).apply(); - verify(mMockRootSurfaceControl, never()).applyTransactionOnDraw(any()); + // App Handles don't need to be rendered in sync with the task animation, per UX. + assertThat(relayoutParams.mAsyncViewHost).isTrue(); } @Test - @Ignore("TODO(b/367235906): Due to MONITOR_INPUT permission error") - public void relayout_freeformTask_appliesTransactionOnDraw() { + public void updateRelayoutParams_header_requestsSyncViewHostRendering() { final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); - final DesktopModeWindowDecoration spyWindowDecor = spy(createWindowDecoration(taskInfo)); + // Make the task freeform so that its decoration is an App Header. taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM); - // Make non-resizable to avoid dealing with input-permissions (MONITOR_INPUT) - taskInfo.isResizeable = false; - - spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); - - verify(mMockTransaction, never()).apply(); - verify(mMockRootSurfaceControl).applyTransactionOnDraw(mMockTransaction); - } - - @Test - public void relayout_fullscreenTask_doesNotCreateViewHostImmediately() { - final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); - final DesktopModeWindowDecoration spyWindowDecor = spy(createWindowDecoration(taskInfo)); - taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN); + final RelayoutParams relayoutParams = new RelayoutParams(); - spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); + DesktopModeWindowDecoration.updateRelayoutParams( + relayoutParams, + mTestableContext, + taskInfo, + mMockSplitScreenController, + /* applyStartTransactionOnDraw= */ true, + /* shouldSetTaskPositionAndCrop= */ false, + /* isStatusBarVisible= */ true, + /* isKeyguardVisibleAndOccluded= */ false, + /* inFullImmersiveMode= */ false, + new InsetsState(), + /* hasGlobalFocus= */ true, + mExclusionRegion); - verify(mMockSurfaceControlViewHostFactory, never()).create(any(), any(), any()); + // App Headers must be rendered in sync with the task animation, so it cannot be delayed. + assertThat(relayoutParams.mAsyncViewHost).isFalse(); } @Test - public void relayout_fullscreenTask_postsViewHostCreation() { + public void relayout_fullscreenTask_appliesTransactionImmediately() { final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); final DesktopModeWindowDecoration spyWindowDecor = spy(createWindowDecoration(taskInfo)); taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN); - ArgumentCaptor<Runnable> runnableArgument = ArgumentCaptor.forClass(Runnable.class); spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); - // Once for view host, the other for the AppHandle input layer. - verify(mMockHandler, times(2)).post(runnableArgument.capture()); - runnableArgument.getValue().run(); - verify(mMockSurfaceControlViewHostFactory).create(any(), any(), any()); + verify(mMockTransaction).apply(); + verify(mMockRootSurfaceControl, never()).applyTransactionOnDraw(any()); } @Test @Ignore("TODO(b/367235906): Due to MONITOR_INPUT permission error") - public void relayout_freeformTask_createsViewHostImmediately() { + public void relayout_freeformTask_appliesTransactionOnDraw() { final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); final DesktopModeWindowDecoration spyWindowDecor = spy(createWindowDecoration(taskInfo)); taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM); @@ -1059,38 +1131,8 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); - verify(mMockSurfaceControlViewHostFactory).create(any(), any(), any()); - verify(mMockHandler, never()).post(any()); - } - - @Test - public void relayout_removesExistingHandlerCallback() { - final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); - final DesktopModeWindowDecoration spyWindowDecor = spy(createWindowDecoration(taskInfo)); - taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN); - ArgumentCaptor<Runnable> runnableArgument = ArgumentCaptor.forClass(Runnable.class); - spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); - // Once for view host, the other for the AppHandle input layer. - verify(mMockHandler, times(2)).post(runnableArgument.capture()); - - spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); - - verify(mMockHandler).removeCallbacks(runnableArgument.getValue()); - } - - @Test - public void close_removesExistingHandlerCallback() { - final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(/* visible= */ true); - final DesktopModeWindowDecoration spyWindowDecor = spy(createWindowDecoration(taskInfo)); - taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FULLSCREEN); - ArgumentCaptor<Runnable> runnableArgument = ArgumentCaptor.forClass(Runnable.class); - spyWindowDecor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); - // Once for view host, the other for the AppHandle input layer. - verify(mMockHandler, times(2)).post(runnableArgument.capture()); - - spyWindowDecor.close(); - - verify(mMockHandler).removeCallbacks(runnableArgument.getValue()); + verify(mMockTransaction, never()).apply(); + verify(mMockRootSurfaceControl).applyTransactionOnDraw(mMockTransaction); } @Test @@ -1293,68 +1335,41 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB) - public void capturedLink_postsOnCapturedLinkExpiredRunnable() { - final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(true /* visible */); - final DesktopModeWindowDecoration decor = createWindowDecoration( - taskInfo, TEST_URI1 /* captured link */, null /* web uri */, - null /* generic link */); - final ArgumentCaptor<Runnable> runnableArgument = ArgumentCaptor.forClass(Runnable.class); - - // Run runnable to set captured link to expired - verify(mMockHandler).postDelayed(runnableArgument.capture(), anyLong()); - runnableArgument.getValue().run(); - - // Verify captured link is no longer valid by verifying link is not set as handle menu - // browser link. - createHandleMenu(decor); - verifyHandleMenuCreated(null /* uri */); - } - - @Test - @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB) public void capturedLink_capturedLinkNotResetToSameLink() { final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(true /* visible */); final DesktopModeWindowDecoration decor = createWindowDecoration( taskInfo, TEST_URI1 /* captured link */, null /* web uri */, null /* generic link */); - final ArgumentCaptor<Runnable> runnableArgument = ArgumentCaptor.forClass(Runnable.class); + final ArgumentCaptor<Function1<Intent, Unit>> openInBrowserCaptor = + ArgumentCaptor.forClass(Function1.class); - // Run runnable to set captured link to expired - verify(mMockHandler).postDelayed(runnableArgument.capture(), anyLong()); - runnableArgument.getValue().run(); + createHandleMenu(decor); + verify(mMockHandleMenu).show(any(), + any(), + any(), + any(), + any(), + any(), + openInBrowserCaptor.capture(), + any(), + any(), + any(), + anyBoolean() + ); + // Run runnable to set captured link to used + openInBrowserCaptor.getValue().invoke(new Intent(Intent.ACTION_MAIN, TEST_URI1)); // Relayout decor with same captured link decor.relayout(taskInfo, true /* hasGlobalFocus */, mExclusionRegion); - // Verify handle menu's browser link not set to captured link since link is expired + // Verify handle menu's browser link not set to captured link since link is already used createHandleMenu(decor); verifyHandleMenuCreated(null /* uri */); } @Test @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB) - public void capturedLink_capturedLinkStillUsedIfExpiredAfterHandleMenuCreation() { - final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(true /* visible */); - final DesktopModeWindowDecoration decor = createWindowDecoration( - taskInfo, TEST_URI1 /* captured link */, null /* web uri */, - null /* generic link */); - final ArgumentCaptor<Runnable> runnableArgument = ArgumentCaptor.forClass(Runnable.class); - - // Create handle menu before link expires - createHandleMenu(decor); - - // Run runnable to set captured link to expired - verify(mMockHandler).postDelayed(runnableArgument.capture(), anyLong()); - runnableArgument.getValue().run(); - - // Verify handle menu's browser link is set to captured link since menu was opened before - // captured link expired - verifyHandleMenuCreated(TEST_URI1); - } - - @Test - @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_APP_TO_WEB) - public void capturedLink_capturedLinkExpiresAfterClick() { + public void capturedLink_capturedLinkSetToUsedAfterClick() { final ActivityManager.RunningTaskInfo taskInfo = createTaskInfo(true /* visible */); final DesktopModeWindowDecoration decor = createWindowDecoration( taskInfo, TEST_URI1 /* captured link */, null /* web uri */, @@ -1716,7 +1731,7 @@ public class DesktopModeWindowDecorationTests extends ShellTestCase { mMockGenericLinksParser, mMockAssistContentRequester, SurfaceControl.Builder::new, mMockTransactionSupplier, WindowContainerTransaction::new, SurfaceControl::new, new WindowManagerWrapper(mMockWindowManager), mMockSurfaceControlViewHostFactory, - maximizeMenuFactory, mMockHandleMenuFactory, + mMockWindowDecorViewHostSupplier, maximizeMenuFactory, mMockHandleMenuFactory, mMockMultiInstanceHelper, mMockCaptionHandleRepository, mDesktopModeEventLogger); windowDecor.setCaptionListeners(mMockTouchEventListener, mMockTouchEventListener, mMockTouchEventListener, mMockTouchEventListener); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java index 04b2be0b1a25..d9693460008f 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/WindowDecorationTests.java @@ -61,6 +61,7 @@ import android.graphics.Color; import android.graphics.Point; import android.graphics.Rect; import android.graphics.Region; +import android.os.Handler; import android.platform.test.flag.junit.SetFlagsRule; import android.testing.AndroidTestingRunner; import android.util.DisplayMetrics; @@ -88,6 +89,8 @@ import com.android.wm.shell.desktopmode.DesktopModeEventLogger; import com.android.wm.shell.shared.desktopmode.DesktopModeStatus; import com.android.wm.shell.tests.R; import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalViewContainer; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost; +import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier; import org.junit.Before; import org.junit.Rule; @@ -130,6 +133,10 @@ public class WindowDecorationTests extends ShellTestCase { @Mock private WindowDecoration.SurfaceControlViewHostFactory mMockSurfaceControlViewHostFactory; @Mock + private WindowDecorViewHostSupplier<WindowDecorViewHost> mMockWindowDecorViewHostSupplier; + @Mock + private WindowDecorViewHost mMockWindowDecorViewHost; + @Mock private SurfaceControlViewHost mMockSurfaceControlViewHost; @Mock private AttachedSurfaceControl mMockRootSurfaceControl; @@ -143,6 +150,8 @@ public class WindowDecorationTests extends ShellTestCase { private SurfaceControl mMockTaskSurface; @Mock private DesktopModeEventLogger mDesktopModeEventLogger; + @Mock + private Handler mMockHandler; private final List<SurfaceControl.Transaction> mMockSurfaceControlTransactions = new ArrayList<>(); @@ -177,6 +186,10 @@ public class WindowDecorationTests extends ShellTestCase { // Add status bar inset so that WindowDecoration does not think task is in immersive mode mInsetsState.getOrCreateSource(STATUS_BAR_INSET_SOURCE_ID, statusBars()).setVisible(true); doReturn(mInsetsState).when(mMockDisplayController).getInsetsState(anyInt()); + + when(mMockWindowDecorViewHostSupplier.acquire(any(), any())) + .thenReturn(mMockWindowDecorViewHost); + when(mMockWindowDecorViewHost.getSurfaceControl()).thenReturn(mock(SurfaceControl.class)); } @Test @@ -233,10 +246,6 @@ public class WindowDecorationTests extends ShellTestCase { final SurfaceControl.Builder decorContainerSurfaceBuilder = createMockSurfaceControlBuilder(decorContainerSurface); mMockSurfaceControlBuilders.add(decorContainerSurfaceBuilder); - final SurfaceControl captionContainerSurface = mock(SurfaceControl.class); - final SurfaceControl.Builder captionContainerSurfaceBuilder = - createMockSurfaceControlBuilder(captionContainerSurface); - mMockSurfaceControlBuilders.add(captionContainerSurfaceBuilder); final ActivityManager.RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder() .setDisplayId(Display.DEFAULT_DISPLAY) @@ -257,18 +266,19 @@ public class WindowDecorationTests extends ShellTestCase { verify(mMockSurfaceControlStartT).setTrustedOverlay(decorContainerSurface, true); verify(mMockSurfaceControlStartT).setWindowCrop(decorContainerSurface, 300, 100); - verify(captionContainerSurfaceBuilder).setParent(decorContainerSurface); - verify(captionContainerSurfaceBuilder).setContainerLayer(); + final SurfaceControl captionContainerSurface = mMockWindowDecorViewHost.getSurfaceControl(); + verify(mMockSurfaceControlStartT).reparent(captionContainerSurface, decorContainerSurface); verify(mMockSurfaceControlStartT).setWindowCrop(captionContainerSurface, 300, 64); verify(mMockSurfaceControlStartT).show(captionContainerSurface); - verify(mMockSurfaceControlViewHostFactory).create(any(), eq(defaultDisplay), any()); - - verify(mMockSurfaceControlViewHost) - .setView(same(mMockView), - argThat(lp -> lp.height == 64 - && lp.width == 300 - && (lp.flags & LayoutParams.FLAG_NOT_FOCUSABLE) != 0)); + verify(mMockWindowDecorViewHost).updateView( + same(mMockView), + argThat(lp -> lp.height == 64 + && lp.width == 300 + && (lp.flags & LayoutParams.FLAG_NOT_FOCUSABLE) != 0), + eq(taskInfo.configuration), + any(), + eq(null) /* onDrawTransaction */); verify(mMockView).setTaskFocusState(true); verify(mMockWindowContainerTransaction).addInsetsSource( eq(taskInfo.token), @@ -297,10 +307,6 @@ public class WindowDecorationTests extends ShellTestCase { final SurfaceControl.Builder decorContainerSurfaceBuilder = createMockSurfaceControlBuilder(decorContainerSurface); mMockSurfaceControlBuilders.add(decorContainerSurfaceBuilder); - final SurfaceControl captionContainerSurface = mock(SurfaceControl.class); - final SurfaceControl.Builder captionContainerSurfaceBuilder = - createMockSurfaceControlBuilder(captionContainerSurface); - mMockSurfaceControlBuilders.add(captionContainerSurfaceBuilder); final SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class); mMockSurfaceControlTransactions.add(t); @@ -323,7 +329,7 @@ public class WindowDecorationTests extends ShellTestCase { windowDecor.relayout(taskInfo, true /* hasGlobalFocus */); - verify(mMockSurfaceControlViewHost, never()).release(); + verify(mMockWindowDecorViewHost, never()).release(any()); verify(t, never()).apply(); verify(mMockWindowContainerTransaction, never()) .removeInsetsSource(eq(taskInfo.token), any(), anyInt(), anyInt()); @@ -333,9 +339,8 @@ public class WindowDecorationTests extends ShellTestCase { taskInfo.isVisible = false; windowDecor.relayout(taskInfo, false /* hasGlobalFocus */); - final InOrder releaseOrder = inOrder(t2, mMockSurfaceControlViewHost); - releaseOrder.verify(mMockSurfaceControlViewHost).release(); - releaseOrder.verify(t2).remove(captionContainerSurface); + final InOrder releaseOrder = inOrder(t2, mMockWindowDecorViewHostSupplier); + releaseOrder.verify(mMockWindowDecorViewHostSupplier).release(mMockWindowDecorViewHost, t2); releaseOrder.verify(t2).remove(decorContainerSurface); releaseOrder.verify(t2).apply(); // Expect to remove two insets sources, the caption insets and the mandatory gesture insets. @@ -383,8 +388,8 @@ public class WindowDecorationTests extends ShellTestCase { verify(mMockDisplayController).removeDisplayWindowListener(same(listener)); assertThat(mRelayoutResult.mRootView).isSameInstanceAs(mMockView); - verify(mMockSurfaceControlViewHostFactory).create(any(), eq(mockDisplay), any()); - verify(mMockSurfaceControlViewHost).setView(same(mMockView), any()); + verify(mMockWindowDecorViewHostSupplier).acquire(any(), eq(mockDisplay)); + verify(mMockWindowDecorViewHost).updateView(same(mMockView), any(), any(), any(), any()); } @Test @@ -397,10 +402,6 @@ public class WindowDecorationTests extends ShellTestCase { final SurfaceControl.Builder decorContainerSurfaceBuilder = createMockSurfaceControlBuilder(decorContainerSurface); mMockSurfaceControlBuilders.add(decorContainerSurfaceBuilder); - final SurfaceControl captionContainerSurface = mock(SurfaceControl.class); - final SurfaceControl.Builder captionContainerSurfaceBuilder = - createMockSurfaceControlBuilder(captionContainerSurface); - mMockSurfaceControlBuilders.add(captionContainerSurfaceBuilder); final SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class); mMockSurfaceControlTransactions.add(t); @@ -436,8 +437,7 @@ public class WindowDecorationTests extends ShellTestCase { windowDecor.mDecorWindowContext.getResources(), mRelayoutParams.mCaptionHeightId); verify(mMockSurfaceControlAddWindowT).setWindowCrop(additionalWindowSurface, width, height); verify(mMockSurfaceControlAddWindowT).show(additionalWindowSurface); - verify(mMockSurfaceControlViewHostFactory, Mockito.times(2)) - .create(any(), eq(defaultDisplay), any()); + verify(mMockSurfaceControlViewHostFactory).create(any(), eq(defaultDisplay), any()); } @Test @@ -450,10 +450,6 @@ public class WindowDecorationTests extends ShellTestCase { final SurfaceControl.Builder decorContainerSurfaceBuilder = createMockSurfaceControlBuilder(decorContainerSurface); mMockSurfaceControlBuilders.add(decorContainerSurfaceBuilder); - final SurfaceControl captionContainerSurface = mock(SurfaceControl.class); - final SurfaceControl.Builder captionContainerSurfaceBuilder = - createMockSurfaceControlBuilder(captionContainerSurface); - mMockSurfaceControlBuilders.add(captionContainerSurfaceBuilder); final SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class); mMockSurfaceControlTransactions.add(t); @@ -472,8 +468,8 @@ public class WindowDecorationTests extends ShellTestCase { windowDecor.relayout(taskInfo, true /* hasGlobalFocus */); - verify(captionContainerSurfaceBuilder).setParent(decorContainerSurface); - verify(captionContainerSurfaceBuilder).setContainerLayer(); + final SurfaceControl captionContainerSurface = mMockWindowDecorViewHost.getSurfaceControl(); + verify(mMockSurfaceControlStartT).reparent(captionContainerSurface, decorContainerSurface); // Width of the captionContainerSurface should match the width of TASK_BOUNDS verify(mMockSurfaceControlStartT).setWindowCrop(captionContainerSurface, 300, 64); verify(mMockSurfaceControlStartT).show(captionContainerSurface); @@ -489,10 +485,6 @@ public class WindowDecorationTests extends ShellTestCase { final SurfaceControl.Builder decorContainerSurfaceBuilder = createMockSurfaceControlBuilder(decorContainerSurface); mMockSurfaceControlBuilders.add(decorContainerSurfaceBuilder); - final SurfaceControl captionContainerSurface = mock(SurfaceControl.class); - final SurfaceControl.Builder captionContainerSurfaceBuilder = - createMockSurfaceControlBuilder(captionContainerSurface); - mMockSurfaceControlBuilders.add(captionContainerSurfaceBuilder); final SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class); mMockSurfaceControlTransactions.add(t); @@ -509,10 +501,11 @@ public class WindowDecorationTests extends ShellTestCase { taskInfo.configuration.densityDpi = DisplayMetrics.DENSITY_DEFAULT * 2; final TestWindowDecoration windowDecor = createWindowDecoration(taskInfo); - windowDecor.relayout(taskInfo, true /* applyStartTransactionOnDraw */, - true /* hasGlobalFocus */, Region.obtain()); + mRelayoutParams.mApplyStartTransactionOnDraw = true; + windowDecor.relayout(taskInfo, true /* hasGlobalFocus */, Region.obtain()); - verify(mMockRootSurfaceControl).applyTransactionOnDraw(mMockSurfaceControlStartT); + verify(mMockWindowDecorViewHost).updateView(any(), any(), any(), any(), + eq(mMockSurfaceControlStartT)); } @Test @@ -901,37 +894,69 @@ public class WindowDecorationTests extends ShellTestCase { } @Test - public void updateViewHost_applyTransactionOnDrawIsTrue_surfaceControlIsUpdated() { + public void relayout_applyTransactionOnDrawIsTrue_updatesViewWithDrawTransaction() { final TestWindowDecoration windowDecor = createWindowDecoration( - new TestRunningTaskInfoBuilder().build()); + new TestRunningTaskInfoBuilder() + .setVisible(true) + .setWindowingMode(WINDOWING_MODE_FREEFORM) + .build()); mRelayoutParams.mApplyStartTransactionOnDraw = true; mRelayoutResult.mRootView = mMockView; - windowDecor.updateViewHost(mRelayoutParams, mMockSurfaceControlStartT, mRelayoutResult); - - verify(mMockRootSurfaceControl).applyTransactionOnDraw(mMockSurfaceControlStartT); + windowDecor.relayout( + windowDecor.mTaskInfo, + /* hasGlobalFocus= */ true, + Region.obtain()); + + verify(mMockWindowDecorViewHost) + .updateView( + eq(mRelayoutResult.mRootView), + any(), + eq(windowDecor.mTaskInfo.configuration), + any(), + eq(mMockSurfaceControlStartT)); + windowDecor.close(); } @Test - public void updateViewHost_nullDrawTransaction_applyTransactionOnDrawIsTrue_throwsException() { + public void relayout_applyTransactionOnDrawIsTrue_asyncViewHostRendering_throwsException() { final TestWindowDecoration windowDecor = createWindowDecoration( - new TestRunningTaskInfoBuilder().build()); + new TestRunningTaskInfoBuilder() + .setVisible(true) + .setWindowingMode(WINDOWING_MODE_FULLSCREEN) + .build()); mRelayoutParams.mApplyStartTransactionOnDraw = true; + mRelayoutParams.mAsyncViewHost = true; mRelayoutResult.mRootView = mMockView; assertThrows(IllegalArgumentException.class, - () -> windowDecor.updateViewHost( - mRelayoutParams, null /* onDrawTransaction */, mRelayoutResult)); + () -> windowDecor.relayout( + windowDecor.mTaskInfo, + /* hasGlobalFocus= */ true, + Region.obtain())); + windowDecor.close(); } @Test - public void updateViewHost_nullDrawTransaction_applyTransactionOnDrawIsFalse_doesNotThrow() { + public void relayout_asyncViewHostRendering() { final TestWindowDecoration windowDecor = createWindowDecoration( - new TestRunningTaskInfoBuilder().build()); + new TestRunningTaskInfoBuilder() + .setVisible(true) + .setWindowingMode(WINDOWING_MODE_FULLSCREEN) + .build()); mRelayoutParams.mApplyStartTransactionOnDraw = false; + mRelayoutParams.mAsyncViewHost = true; mRelayoutResult.mRootView = mMockView; - windowDecor.updateViewHost(mRelayoutParams, null /* onDrawTransaction */, mRelayoutResult); + windowDecor.relayout( + windowDecor.mTaskInfo, + /* hasGlobalFocus= */ true, + Region.obtain()); + + verify(mMockWindowDecorViewHost) + .updateViewAsync(eq(mRelayoutResult.mRootView), any(), + eq(windowDecor.mTaskInfo.configuration), any()); + windowDecor.close(); } @Test @@ -1015,7 +1040,8 @@ public class WindowDecorationTests extends ShellTestCase { new MockObjectSupplier<>(mMockSurfaceControlTransactions, () -> mock(SurfaceControl.Transaction.class)), () -> mMockWindowContainerTransaction, () -> mMockTaskSurface, - mMockSurfaceControlViewHostFactory, mDesktopModeEventLogger); + mMockSurfaceControlViewHostFactory, mMockWindowDecorViewHostSupplier, + mDesktopModeEventLogger); } private class MockObjectSupplier<T> implements Supplier<T> { @@ -1049,18 +1075,22 @@ public class WindowDecorationTests extends ShellTestCase { private class TestWindowDecoration extends WindowDecoration<TestView> { TestWindowDecoration(Context context, @NonNull Context userContext, DisplayController displayController, - ShellTaskOrganizer taskOrganizer, ActivityManager.RunningTaskInfo taskInfo, + ShellTaskOrganizer taskOrganizer, + ActivityManager.RunningTaskInfo taskInfo, SurfaceControl taskSurface, Supplier<SurfaceControl.Builder> surfaceControlBuilderSupplier, Supplier<SurfaceControl.Transaction> surfaceControlTransactionSupplier, Supplier<WindowContainerTransaction> windowContainerTransactionSupplier, Supplier<SurfaceControl> surfaceControlSupplier, SurfaceControlViewHostFactory surfaceControlViewHostFactory, + @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> + windowDecorViewHostSupplier, DesktopModeEventLogger desktopModeEventLogger) { - super(context, userContext, displayController, taskOrganizer, taskInfo, taskSurface, - surfaceControlBuilderSupplier, surfaceControlTransactionSupplier, + super(context, userContext, displayController, taskOrganizer, taskInfo, + taskSurface, surfaceControlBuilderSupplier, surfaceControlTransactionSupplier, windowContainerTransactionSupplier, surfaceControlSupplier, - surfaceControlViewHostFactory, desktopModeEventLogger); + surfaceControlViewHostFactory, windowDecorViewHostSupplier, + desktopModeEventLogger); } void relayout(ActivityManager.RunningTaskInfo taskInfo, boolean hasGlobalFocus) { @@ -1071,8 +1101,12 @@ public class WindowDecorationTests extends ShellTestCase { @Override void relayout(ActivityManager.RunningTaskInfo taskInfo, boolean hasGlobalFocus, @NonNull Region displayExclusionRegion) { - relayout(taskInfo, false /* applyStartTransactionOnDraw */, hasGlobalFocus, - displayExclusionRegion); + mRelayoutParams.mRunningTaskInfo = taskInfo; + mRelayoutParams.mHasGlobalFocus = hasGlobalFocus; + mRelayoutParams.mDisplayExclusionRegion.set(displayExclusionRegion); + mRelayoutParams.mLayoutResId = R.layout.caption_layout; + relayout(mRelayoutParams, mMockSurfaceControlStartT, mMockSurfaceControlFinishT, + mMockWindowContainerTransaction, mMockView, mRelayoutResult); } @Override @@ -1096,13 +1130,8 @@ public class WindowDecorationTests extends ShellTestCase { void relayout(ActivityManager.RunningTaskInfo taskInfo, boolean applyStartTransactionOnDraw, boolean hasGlobalFocus, @NonNull Region displayExclusionRegion) { - mRelayoutParams.mRunningTaskInfo = taskInfo; mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw; - mRelayoutParams.mLayoutResId = R.layout.caption_layout; - mRelayoutParams.mHasGlobalFocus = hasGlobalFocus; - mRelayoutParams.mDisplayExclusionRegion.set(displayExclusionRegion); - relayout(mRelayoutParams, mMockSurfaceControlStartT, mMockSurfaceControlFinishT, - mMockWindowContainerTransaction, mMockView, mRelayoutResult); + relayout(taskInfo, hasGlobalFocus, displayExclusionRegion); } private AdditionalViewContainer addTestViewContainer() { diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp index 49254d1c6f6e..dbb891455ddd 100644 --- a/libs/androidfw/ApkAssets.cpp +++ b/libs/androidfw/ApkAssets.cpp @@ -40,20 +40,21 @@ ApkAssets::ApkAssets(PrivateConstructorUtil, std::unique_ptr<Asset> resources_as } ApkAssetsPtr ApkAssets::Load(const std::string& path, package_property_t flags) { - return Load(ZipAssetsProvider::Create(path, flags), flags); + return LoadImpl(ZipAssetsProvider::Create(path, flags), flags); } ApkAssetsPtr ApkAssets::LoadFromFd(base::unique_fd fd, const std::string& debug_name, package_property_t flags, off64_t offset, off64_t len) { - return Load(ZipAssetsProvider::Create(std::move(fd), debug_name, offset, len), flags); + return LoadImpl(ZipAssetsProvider::Create(std::move(fd), debug_name, offset, len), flags); } -ApkAssetsPtr ApkAssets::Load(std::unique_ptr<AssetsProvider> assets, package_property_t flags) { +ApkAssetsPtr ApkAssets::LoadImpl(std::unique_ptr<AssetsProvider>&& assets, + package_property_t flags) { return LoadImpl(std::move(assets), flags, nullptr /* idmap_asset */, nullptr /* loaded_idmap */); } -ApkAssetsPtr ApkAssets::LoadTable(std::unique_ptr<Asset> resources_asset, - std::unique_ptr<AssetsProvider> assets, +ApkAssetsPtr ApkAssets::LoadTable(std::unique_ptr<Asset>&& resources_asset, + std::unique_ptr<AssetsProvider>&& assets, package_property_t flags) { if (resources_asset == nullptr) { return {}; @@ -97,10 +98,10 @@ ApkAssetsPtr ApkAssets::LoadOverlay(const std::string& idmap_path, package_prope std::move(loaded_idmap)); } -ApkAssetsPtr ApkAssets::LoadImpl(std::unique_ptr<AssetsProvider> assets, +ApkAssetsPtr ApkAssets::LoadImpl(std::unique_ptr<AssetsProvider>&& assets, package_property_t property_flags, - std::unique_ptr<Asset> idmap_asset, - std::unique_ptr<LoadedIdmap> loaded_idmap) { + std::unique_ptr<Asset>&& idmap_asset, + std::unique_ptr<LoadedIdmap>&& loaded_idmap) { if (assets == nullptr) { return {}; } @@ -119,11 +120,11 @@ ApkAssetsPtr ApkAssets::LoadImpl(std::unique_ptr<AssetsProvider> assets, std::move(idmap_asset), std::move(loaded_idmap)); } -ApkAssetsPtr ApkAssets::LoadImpl(std::unique_ptr<Asset> resources_asset, - std::unique_ptr<AssetsProvider> assets, +ApkAssetsPtr ApkAssets::LoadImpl(std::unique_ptr<Asset>&& resources_asset, + std::unique_ptr<AssetsProvider>&& assets, package_property_t property_flags, - std::unique_ptr<Asset> idmap_asset, - std::unique_ptr<LoadedIdmap> loaded_idmap) { + std::unique_ptr<Asset>&& idmap_asset, + std::unique_ptr<LoadedIdmap>&& loaded_idmap) { if (assets == nullptr ) { return {}; } diff --git a/libs/androidfw/include/androidfw/ApkAssets.h b/libs/androidfw/include/androidfw/ApkAssets.h index 1fa67528c78b..231808beb718 100644 --- a/libs/androidfw/include/androidfw/ApkAssets.h +++ b/libs/androidfw/include/androidfw/ApkAssets.h @@ -47,13 +47,37 @@ class ApkAssets : public RefBase { package_property_t flags = 0U, off64_t offset = 0, off64_t len = AssetsProvider::kUnknownLength); + // // Creates an ApkAssets from an AssetProvider. - // The ApkAssets will take care of destroying the AssetsProvider when it is destroyed. - static ApkAssetsPtr Load(std::unique_ptr<AssetsProvider> assets, package_property_t flags = 0U); + // The ApkAssets will take care of destroying the AssetsProvider when it is destroyed; + // the original argument is not moved from if loading fails. + // + // Note: this function takes care of the case when you pass a move(unique_ptr<Derived>) + // that would create a temporary unique_ptr<AssetsProvider> by moving your pointer into + // it before the function call, making it impossible to not move from the parameter + // on loading failure. The two overloads take care of moving the pointer back if needed. + // + + template <class T> + static ApkAssetsPtr Load(std::unique_ptr<T>&& assets, package_property_t flags = 0U) + requires(std::is_same_v<T, AssetsProvider>) { + return LoadImpl(std::move(assets), flags); + } + + template <class T> + static ApkAssetsPtr Load(std::unique_ptr<T>&& assets, package_property_t flags = 0U) + requires(!std::is_same_v<T, AssetsProvider> && std::is_base_of_v<AssetsProvider, T>) { + std::unique_ptr<AssetsProvider> base_assets(std::move(assets)); + auto res = LoadImpl(std::move(base_assets), flags); + if (!res) { + assets.reset(static_cast<T*>(base_assets.release())); + } + return res; + } // Creates an ApkAssets from the given asset file representing a resources.arsc. - static ApkAssetsPtr LoadTable(std::unique_ptr<Asset> resources_asset, - std::unique_ptr<AssetsProvider> assets, + static ApkAssetsPtr LoadTable(std::unique_ptr<Asset>&& resources_asset, + std::unique_ptr<AssetsProvider>&& assets, package_property_t flags = 0U); // Creates an ApkAssets from an IDMAP, which contains the original APK path, and the overlay @@ -94,17 +118,29 @@ class ApkAssets : public RefBase { bool IsUpToDate() const; + // DANGER! + // This is a destructive method that rips the assets provider out of ApkAssets object. + // It is only useful when one knows this assets object can't be used anymore, and they + // need the underlying assets provider back (e.g. when initialization fails for some + // reason). + std::unique_ptr<AssetsProvider> TakeAssetsProvider() && { + return std::move(assets_provider_); + } + private: - static ApkAssetsPtr LoadImpl(std::unique_ptr<AssetsProvider> assets, + static ApkAssetsPtr LoadImpl(std::unique_ptr<AssetsProvider>&& assets, package_property_t property_flags, - std::unique_ptr<Asset> idmap_asset, - std::unique_ptr<LoadedIdmap> loaded_idmap); + std::unique_ptr<Asset>&& idmap_asset, + std::unique_ptr<LoadedIdmap>&& loaded_idmap); - static ApkAssetsPtr LoadImpl(std::unique_ptr<Asset> resources_asset, - std::unique_ptr<AssetsProvider> assets, + static ApkAssetsPtr LoadImpl(std::unique_ptr<Asset>&& resources_asset, + std::unique_ptr<AssetsProvider>&& assets, package_property_t property_flags, - std::unique_ptr<Asset> idmap_asset, - std::unique_ptr<LoadedIdmap> loaded_idmap); + std::unique_ptr<Asset>&& idmap_asset, + std::unique_ptr<LoadedIdmap>&& loaded_idmap); + + static ApkAssetsPtr LoadImpl(std::unique_ptr<AssetsProvider>&& assets, + package_property_t flags = 0U); // Allows us to make it possible to call make_shared from inside the class but still keeps the // ctor 'private' for all means and purposes. diff --git a/libs/androidfw/tests/ApkAssets_test.cpp b/libs/androidfw/tests/ApkAssets_test.cpp index 70326b71da28..c36d9908032f 100644 --- a/libs/androidfw/tests/ApkAssets_test.cpp +++ b/libs/androidfw/tests/ApkAssets_test.cpp @@ -28,6 +28,7 @@ using ::android::base::unique_fd; using ::com::android::basic::R; using ::testing::Eq; using ::testing::Ge; +using ::testing::IsNull; using ::testing::NotNull; using ::testing::SizeIs; using ::testing::StrEq; @@ -108,4 +109,26 @@ TEST(ApkAssetsTest, OpenUncompressedAssetFd) { EXPECT_THAT(buffer, StrEq("This should be uncompressed.\n\n")); } +TEST(ApkAssetsTest, TakeAssetsProviderNotCrashing) { + // Make sure the apk assets object can survive taking its assets provider and doesn't crash + // the process. + { + auto loaded_apk = ApkAssets::Load(GetTestDataPath() + "/basic/basic.apk"); + ASSERT_THAT(loaded_apk, NotNull()); + + auto provider = std::move(*loaded_apk).TakeAssetsProvider(); + ASSERT_THAT(provider, NotNull()); + } + // If this test doesn't crash by this point we're all good. +} + +TEST(ApkAssetsTest, AssetsProviderNotMovedOnError) { + auto assets_provider + = ZipAssetsProvider::Create(GetTestDataPath() + "/bad/bad.apk", 0); + ASSERT_THAT(assets_provider, NotNull()); + auto loaded_apk = ApkAssets::Load(std::move(assets_provider)); + ASSERT_THAT(loaded_apk, IsNull()); + ASSERT_THAT(assets_provider, NotNull()); +} + } // namespace android diff --git a/libs/androidfw/tests/data/bad/bad.apk b/libs/androidfw/tests/data/bad/bad.apk Binary files differnew file mode 100644 index 000000000000..3226bcd52e99 --- /dev/null +++ b/libs/androidfw/tests/data/bad/bad.apk diff --git a/libs/input/MouseCursorController.cpp b/libs/input/MouseCursorController.cpp index d993b8715260..65663d065b8e 100644 --- a/libs/input/MouseCursorController.cpp +++ b/libs/input/MouseCursorController.cpp @@ -28,12 +28,14 @@ #define INDENT " " #define INDENT2 " " +namespace android { + namespace { + // Time to spend fading out the pointer completely. const nsecs_t POINTER_FADE_DURATION = 500 * 1000000LL; // 500 ms -} // namespace -namespace android { +} // namespace // --- MouseCursorController --- @@ -47,8 +49,7 @@ MouseCursorController::MouseCursorController(PointerControllerContext& context) mLocked.lastFrameUpdatedTime = 0; mLocked.pointerFadeDirection = 0; - mLocked.pointerX = 0; - mLocked.pointerY = 0; + mLocked.pointerPosition = {0, 0}; mLocked.pointerAlpha = 0.0f; // pointer is initially faded mLocked.pointerSprite = mContext.getSpriteController().createSprite(); mLocked.updatePointerIcon = false; @@ -64,50 +65,60 @@ MouseCursorController::~MouseCursorController() { mLocked.pointerSprite.clear(); } -void MouseCursorController::move(float deltaX, float deltaY) { +vec2 MouseCursorController::move(vec2 delta) { #if DEBUG_MOUSE_CURSOR_UPDATES ALOGD("Move pointer by deltaX=%0.3f, deltaY=%0.3f", deltaX, deltaY); #endif - if (deltaX == 0.0f && deltaY == 0.0f) { - return; + if (delta.x == 0.0f && delta.y == 0.0f) { + return {0, 0}; } + // When transition occurs, the MouseCursorController object may or may not be deleted, depending + // if there's another display on the other side of the transition. At this point we still need + // to move the cursor to the boundary. std::scoped_lock lock(mLock); - - setPositionLocked(mLocked.pointerX + deltaX, mLocked.pointerY + deltaY); + const vec2 targetPosition = mLocked.pointerPosition + delta; + setPositionLocked(targetPosition); + // The amount of the delta that was not consumed as a result of the cursor + // hitting the edge of the display. + return targetPosition - mLocked.pointerPosition; } -void MouseCursorController::setPosition(float x, float y) { +void MouseCursorController::setPosition(vec2 position) { #if DEBUG_MOUSE_CURSOR_UPDATES ALOGD("Set pointer position to x=%0.3f, y=%0.3f", x, y); #endif std::scoped_lock lock(mLock); - setPositionLocked(x, y); + setPositionLocked(position); } -void MouseCursorController::setPositionLocked(float x, float y) REQUIRES(mLock) { - const auto& v = mLocked.viewport; - if (!v.isValid()) return; - +FloatRect MouseCursorController::getBoundsLocked() REQUIRES(mLock) { // The valid bounds for a mouse cursor. Since the right and bottom edges are considered outside // the display, clip the bounds by one pixel instead of letting the cursor get arbitrarily // close to the outside edge. - const FloatRect bounds{ + return FloatRect{ static_cast<float>(mLocked.viewport.logicalLeft), static_cast<float>(mLocked.viewport.logicalTop), static_cast<float>(mLocked.viewport.logicalRight - 1), static_cast<float>(mLocked.viewport.logicalBottom - 1), }; - mLocked.pointerX = std::max(bounds.left, std::min(bounds.right, x)); - mLocked.pointerY = std::max(bounds.top, std::min(bounds.bottom, y)); +} + +void MouseCursorController::setPositionLocked(vec2 position) REQUIRES(mLock) { + const auto& v = mLocked.viewport; + if (!v.isValid()) return; + + const FloatRect bounds = getBoundsLocked(); + mLocked.pointerPosition.x = std::max(bounds.left, std::min(bounds.right, position.x)); + mLocked.pointerPosition.y = std::max(bounds.top, std::min(bounds.bottom, position.y)); updatePointerLocked(); } -FloatPoint MouseCursorController::getPosition() const { +vec2 MouseCursorController::getPosition() const { std::scoped_lock lock(mLock); - return {mLocked.pointerX, mLocked.pointerY}; + return mLocked.pointerPosition; } ui::LogicalDisplayId MouseCursorController::getDisplayId() const { @@ -209,20 +220,21 @@ void MouseCursorController::setDisplayViewport(const DisplayViewport& viewport, if (viewport.isValid()) { // Use integer coordinates as the starting point for the cursor location. // We usually expect display sizes to be even numbers, so the flooring is precautionary. - mLocked.pointerX = std::floor((viewport.logicalLeft + viewport.logicalRight) / 2); - mLocked.pointerY = std::floor((viewport.logicalTop + viewport.logicalBottom) / 2); + mLocked.pointerPosition.x = + std::floor((viewport.logicalLeft + viewport.logicalRight) / 2); + mLocked.pointerPosition.y = + std::floor((viewport.logicalTop + viewport.logicalBottom) / 2); // Reload icon resources for density may be changed. loadResourcesLocked(getAdditionalMouseResources); } else { - mLocked.pointerX = 0; - mLocked.pointerY = 0; + mLocked.pointerPosition = {0, 0}; } } else if (oldViewport.orientation != viewport.orientation) { // Apply offsets to convert from the pixel top-left corner position to the pixel center. // This creates an invariant frame of reference that we can easily rotate when // taking into account that the pointer may be located at fractional pixel offsets. - float x = mLocked.pointerX + 0.5f; - float y = mLocked.pointerY + 0.5f; + float x = mLocked.pointerPosition.x + 0.5f; + float y = mLocked.pointerPosition.y + 0.5f; float temp; // Undo the previous rotation. @@ -267,8 +279,8 @@ void MouseCursorController::setDisplayViewport(const DisplayViewport& viewport, // Apply offsets to convert from the pixel center to the pixel top-left corner position // and save the results. - mLocked.pointerX = x - 0.5f; - mLocked.pointerY = y - 0.5f; + mLocked.pointerPosition.x = x - 0.5f; + mLocked.pointerPosition.y = y - 0.5f; } updatePointerLocked(); @@ -354,7 +366,7 @@ void MouseCursorController::updatePointerLocked() REQUIRES(mLock) { spriteController.openTransaction(); mLocked.pointerSprite->setLayer(Sprite::BASE_LAYER_POINTER); - mLocked.pointerSprite->setPosition(mLocked.pointerX, mLocked.pointerY); + mLocked.pointerSprite->setPosition(mLocked.pointerPosition.x, mLocked.pointerPosition.y); mLocked.pointerSprite->setDisplayId(mLocked.viewport.displayId); mLocked.pointerSprite->setSkipScreenshot(mLocked.skipScreenshot); diff --git a/libs/input/MouseCursorController.h b/libs/input/MouseCursorController.h index 12b31a8c531a..7c674b53d620 100644 --- a/libs/input/MouseCursorController.h +++ b/libs/input/MouseCursorController.h @@ -20,9 +20,6 @@ #include <gui/DisplayEventReceiver.h> #include <input/DisplayViewport.h> #include <input/Input.h> -#include <utils/BitSet.h> -#include <utils/Looper.h> -#include <utils/RefBase.h> #include <functional> #include <map> @@ -43,9 +40,10 @@ public: MouseCursorController(PointerControllerContext& context); ~MouseCursorController(); - void move(float deltaX, float deltaY); - void setPosition(float x, float y); - FloatPoint getPosition() const; + // Move the pointer and return unconsumed delta + vec2 move(vec2 delta); + void setPosition(vec2 position); + vec2 getPosition() const; ui::LogicalDisplayId getDisplayId() const; void fade(PointerControllerInterface::Transition transition); void unfade(PointerControllerInterface::Transition transition); @@ -83,8 +81,7 @@ private: nsecs_t lastFrameUpdatedTime; int32_t pointerFadeDirection; - float pointerX; - float pointerY; + vec2 pointerPosition; float pointerAlpha; sp<Sprite> pointerSprite; SpriteIcon pointerIcon; @@ -103,7 +100,7 @@ private: } mLocked GUARDED_BY(mLock); - void setPositionLocked(float x, float y); + void setPositionLocked(vec2 position); void updatePointerLocked(); @@ -113,6 +110,7 @@ private: bool doFadingAnimationLocked(nsecs_t timestamp); void startAnimationLocked(); + FloatRect getBoundsLocked(); }; } // namespace android diff --git a/libs/input/PointerController.cpp b/libs/input/PointerController.cpp index 78d7d3a7051b..0b81211ee666 100644 --- a/libs/input/PointerController.cpp +++ b/libs/input/PointerController.cpp @@ -138,15 +138,16 @@ std::mutex& PointerController::getLock() const { return mDisplayInfoListener->mLock; } -void PointerController::move(float deltaX, float deltaY) { +vec2 PointerController::move(float deltaX, float deltaY) { const ui::LogicalDisplayId displayId = mCursorController.getDisplayId(); - vec2 transformed; + ui::Transform transform; { std::scoped_lock lock(getLock()); - const auto& transform = getTransformForDisplayLocked(displayId); - transformed = transformWithoutTranslation(transform, {deltaX, deltaY}); + transform = getTransformForDisplayLocked(displayId); } - mCursorController.move(transformed.x, transformed.y); + + const vec2 transformed = transformWithoutTranslation(transform, {deltaX, deltaY}); + return transformWithoutTranslation(transform.inverse(), mCursorController.move(transformed)); } void PointerController::setPosition(float x, float y) { @@ -157,16 +158,15 @@ void PointerController::setPosition(float x, float y) { const auto& transform = getTransformForDisplayLocked(displayId); transformed = transform.transform(x, y); } - mCursorController.setPosition(transformed.x, transformed.y); + mCursorController.setPosition(transformed); } -FloatPoint PointerController::getPosition() const { +vec2 PointerController::getPosition() const { const ui::LogicalDisplayId displayId = mCursorController.getDisplayId(); const auto p = mCursorController.getPosition(); { std::scoped_lock lock(getLock()); - const auto& transform = getTransformForDisplayLocked(displayId); - return FloatPoint{transform.inverse().transform(p.x, p.y)}; + return getTransformForDisplayLocked(displayId).inverse().transform(p.x, p.y); } } @@ -295,6 +295,11 @@ void PointerController::clearSkipScreenshotFlags() { mCursorController.setSkipScreenshot(false); } +ui::Transform PointerController::getDisplayTransform() const { + std::scoped_lock lock(getLock()); + return getTransformForDisplayLocked(mLocked.pointerDisplayId); +} + void PointerController::doInactivityTimeout() { fade(Transition::GRADUAL); } diff --git a/libs/input/PointerController.h b/libs/input/PointerController.h index ee8d1211341f..afd7215c7fba 100644 --- a/libs/input/PointerController.h +++ b/libs/input/PointerController.h @@ -51,9 +51,9 @@ public: ~PointerController() override; - void move(float deltaX, float deltaY) override; + vec2 move(float deltaX, float deltaY) override; void setPosition(float x, float y) override; - FloatPoint getPosition() const override; + vec2 getPosition() const override; ui::LogicalDisplayId getDisplayId() const override; void fade(Transition transition) override; void unfade(Transition transition) override; @@ -67,6 +67,7 @@ public: void setCustomPointerIcon(const SpriteIcon& icon) override; void setSkipScreenshotFlagForDisplay(ui::LogicalDisplayId displayId) override; void clearSkipScreenshotFlags() override; + ui::Transform getDisplayTransform() const override; virtual void setInactivityTimeout(InactivityTimeout inactivityTimeout); void doInactivityTimeout(); @@ -165,13 +166,13 @@ public: ~TouchPointerController() override; - void move(float, float) override { + vec2 move(float, float) override { LOG_ALWAYS_FATAL("Should not be called"); } void setPosition(float, float) override { LOG_ALWAYS_FATAL("Should not be called"); } - FloatPoint getPosition() const override { + vec2 getPosition() const override { LOG_ALWAYS_FATAL("Should not be called"); } ui::LogicalDisplayId getDisplayId() const override { diff --git a/libs/input/tests/PointerController_test.cpp b/libs/input/tests/PointerController_test.cpp index 5b00fca4d857..80c934a9bd95 100644 --- a/libs/input/tests/PointerController_test.cpp +++ b/libs/input/tests/PointerController_test.cpp @@ -40,6 +40,8 @@ enum TestCursorType { CURSOR_TYPE_CUSTOM = -1, }; +static constexpr float EPSILON = MotionEvent::ROUNDING_PRECISION; + using ::testing::AllOf; using ::testing::Field; using ::testing::NiceMock; @@ -399,6 +401,135 @@ INSTANTIATE_TEST_SUITE_P(PointerControllerSkipScreenshotFlagTest, testing::Values(PointerControllerInterface::ControllerType::MOUSE, PointerControllerInterface::ControllerType::STYLUS)); +class MousePointerControllerTest : public PointerControllerTest { +protected: + MousePointerControllerTest() { + sp<MockSprite> testPointerSprite(new NiceMock<MockSprite>); + EXPECT_CALL(*mSpriteController, createSprite).WillOnce(Return(testPointerSprite)); + + // create a mouse pointer controller + mPointerController = + PointerController::create(mPolicy, mLooper, *mSpriteController, + PointerControllerInterface::ControllerType::MOUSE); + + // set display viewport + DisplayViewport viewport; + viewport.displayId = ui::LogicalDisplayId::DEFAULT; + viewport.logicalRight = 5; + viewport.logicalBottom = 5; + viewport.physicalRight = 5; + viewport.physicalBottom = 5; + viewport.deviceWidth = 5; + viewport.deviceHeight = 5; + mPointerController->setDisplayViewport(viewport); + } +}; + +struct MousePointerControllerTestParam { + vec2 startPosition; + vec2 delta; + vec2 endPosition; + vec2 unconsumedDelta; +}; + +class PointerControllerViewportTransitionTest + : public MousePointerControllerTest, + public testing::WithParamInterface<MousePointerControllerTestParam> {}; + +TEST_P(PointerControllerViewportTransitionTest, testPointerViewportTransition) { + const auto& params = GetParam(); + + mPointerController->setPosition(params.startPosition.x, params.startPosition.y); + auto unconsumedDelta = mPointerController->move(params.delta.x, params.delta.y); + + auto position = mPointerController->getPosition(); + EXPECT_NEAR(position.x, params.endPosition.x, EPSILON); + EXPECT_NEAR(position.y, params.endPosition.y, EPSILON); + EXPECT_NEAR(unconsumedDelta.x, params.unconsumedDelta.x, EPSILON); + EXPECT_NEAR(unconsumedDelta.y, params.unconsumedDelta.y, EPSILON); +} + +INSTANTIATE_TEST_SUITE_P(PointerControllerViewportTransitionTest, + PointerControllerViewportTransitionTest, + testing::Values( + // no transition + MousePointerControllerTestParam{{2.0f, 2.0f}, + {2.0f, 2.0f}, + {4.0f, 4.0f}, + {0.0f, 0.0f}}, + // right boundary + MousePointerControllerTestParam{{2.0f, 2.0f}, + {3.0f, 0.0f}, + {4.0f, 2.0f}, + {1.0f, 0.0f}}, + MousePointerControllerTestParam{{2.0f, 2.0f}, + {3.0f, -1.0f}, + {4.0f, 1.0f}, + {1.0f, 0.0f}}, + MousePointerControllerTestParam{{2.0f, 2.0f}, + {3.0f, 1.0f}, + {4.0f, 3.0f}, + {1.0f, 0.0f}}, + // left boundary + MousePointerControllerTestParam{{2.0f, 2.0f}, + {-3.0f, 0.0f}, + {0.0f, 2.0f}, + {-1.0f, 0.0f}}, + MousePointerControllerTestParam{{2.0f, 2.0f}, + {-3.0f, -1.0f}, + {0.0f, 1.0f}, + {-1.0f, 0.0f}}, + MousePointerControllerTestParam{{2.0f, 2.0f}, + {-3.0f, 1.0f}, + {0.0f, 3.0f}, + {-1.0f, 0.0f}}, + // bottom boundary + MousePointerControllerTestParam{{2.0f, 2.0f}, + {0.0f, 3.0f}, + {2.0f, 4.0f}, + {0.0f, 1.0f}}, + MousePointerControllerTestParam{{2.0f, 2.0f}, + {-1.0f, 3.0f}, + {1.0f, 4.0f}, + {0.0f, 1.0f}}, + MousePointerControllerTestParam{{2.0f, 2.0f}, + {1.0f, 3.0f}, + {3.0f, 4.0f}, + {0.0f, 1.0f}}, + // top boundary + MousePointerControllerTestParam{{2.0f, 2.0f}, + {0.0f, -3.0f}, + {2.0f, 0.0f}, + {0.0f, -1.0f}}, + MousePointerControllerTestParam{{2.0f, 2.0f}, + {-1.0f, -3.0f}, + {1.0f, 0.0f}, + {0.0f, -1.0f}}, + MousePointerControllerTestParam{{2.0f, 2.0f}, + {1.0f, -3.0f}, + {3.0f, 0.0f}, + {0.0f, -1.0f}}, + // top-left corner + MousePointerControllerTestParam{{2.0f, 2.0f}, + {-3.0f, -3.0f}, + {0.0f, 0.0f}, + {-1.0f, -1.0f}}, + // top-right corner + MousePointerControllerTestParam{{2.0f, 2.0f}, + {3.0f, -3.0f}, + {4.0f, 0.0f}, + {1.0f, -1.0f}}, + // bottom-right corner + MousePointerControllerTestParam{{2.0f, 2.0f}, + {3.0f, 3.0f}, + {4.0f, 4.0f}, + {1.0f, 1.0f}}, + // bottom-left corner + MousePointerControllerTestParam{{2.0f, 2.0f}, + {-3.0f, 3.0f}, + {0.0f, 4.0f}, + {-1.0f, 1.0f}})); + class PointerControllerWindowInfoListenerTest : public Test {}; TEST_F(PointerControllerWindowInfoListenerTest, diff --git a/location/api/system-current.txt b/location/api/system-current.txt index 8cd08d3aad6c..9478e350de57 100644 --- a/location/api/system-current.txt +++ b/location/api/system-current.txt @@ -645,7 +645,7 @@ package android.location.provider { @FlaggedApi("android.location.flags.population_density_provider") public abstract class PopulationDensityProviderBase { ctor public PopulationDensityProviderBase(@NonNull android.content.Context, @NonNull String); method @Nullable public final android.os.IBinder getBinder(); - method public abstract void onGetCoarsenedS2Cell(double, double, @NonNull android.os.OutcomeReceiver<long[],java.lang.Throwable>); + method public abstract void onGetCoarsenedS2Cells(double, double, @IntRange(from=0) int, @NonNull android.os.OutcomeReceiver<long[],java.lang.Throwable>); method public abstract void onGetDefaultCoarseningLevel(@NonNull android.os.OutcomeReceiver<java.lang.Integer,java.lang.Throwable>); field public static final String ACTION_POPULATION_DENSITY_PROVIDER = "com.android.location.service.PopulationDensityProvider"; } diff --git a/location/java/android/location/provider/IPopulationDensityProvider.aidl b/location/java/android/location/provider/IPopulationDensityProvider.aidl index 9b5cb5ae8c7a..41fe5006983d 100644 --- a/location/java/android/location/provider/IPopulationDensityProvider.aidl +++ b/location/java/android/location/provider/IPopulationDensityProvider.aidl @@ -35,11 +35,11 @@ oneway interface IPopulationDensityProvider { void getDefaultCoarseningLevel(in IS2LevelCallback callback); /** - * Returns a list of IDs of the S2 cells to be used to coarsen a location. The answer should + * Requests a list of IDs of the S2 cells to be used to coarsen a location. The answer should * contain at least one S2 cell, which should contain the requested location. Its level - * represents the population density. Optionally, additional nearby cells can be also returned, - * to assist in coarsening nearby locations. + * represents the population density. Optionally, if numAdditionalCells is greater than 0, + * additional nearby cells can be also returned, to assist in coarsening nearby locations. */ - void getCoarsenedS2Cell(double latitudeDegrees, double longitudeDegrees, in IS2CellIdsCallback - callback); + void getCoarsenedS2Cells(double latitudeDegrees, double longitudeDegrees, + int numAdditionalCells, in IS2CellIdsCallback callback); } diff --git a/location/java/android/location/provider/PopulationDensityProviderBase.java b/location/java/android/location/provider/PopulationDensityProviderBase.java index 3907516f6aaa..0177cf8694df 100644 --- a/location/java/android/location/provider/PopulationDensityProviderBase.java +++ b/location/java/android/location/provider/PopulationDensityProviderBase.java @@ -17,6 +17,7 @@ package android.location.provider; import android.annotation.FlaggedApi; +import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SuppressLint; @@ -89,17 +90,18 @@ public abstract class PopulationDensityProviderBase { * Called upon receiving a new request for population density at a specific latitude/longitude, * expressed in degrees. * The answer is at least one S2CellId corresponding to the coarsening level at the specified - * location. This must be the first element of the result array. Optionally, additional nearby - * S2CellIds can be returned. One use for the optional nearby cells is when the client has a - * local cache that needs to be filled with the local area around a certain latitude/longitude. - * The callback {@link OutcomeReceiver#onResult} should be called with the result; or, in case - * an error occurs, {@link OutcomeReceiver#onError} should be called. - * The callback is single-use, calling more than any one of these two methods throws an - * AssertionException. + * location. This must be the first element of the result array. Optionally, if + * numAdditionalCells is greater than zero, additional nearby S2CellIds can be returned. One use + * for the optional nearby cells is when the client has a local cache that needs to be filled + * with the local area around a certain latitude/longitude. The callback + * {@link OutcomeReceiver#onResult} should be called with the result; or, in case an error + * occurs, {@link OutcomeReceiver#onError} should be called. The callback is single-use, calling + * more than any one of these two methods throws an AssertionException. * * @param callback A single-use callback that either returns S2CellIds, or an error. */ - public abstract void onGetCoarsenedS2Cell(double latitudeDegrees, double longitudeDegrees, + public abstract void onGetCoarsenedS2Cells(double latitudeDegrees, double longitudeDegrees, + @IntRange(from = 0) int numAdditionalCells, @NonNull OutcomeReceiver<long[], Throwable> callback); private final class Service extends IPopulationDensityProvider.Stub { @@ -119,10 +121,10 @@ public abstract class PopulationDensityProviderBase { } @Override - public void getCoarsenedS2Cell(double latitudeDegrees, double longitudeDegrees, - @NonNull IS2CellIdsCallback callback) { + public void getCoarsenedS2Cells(double latitudeDegrees, double longitudeDegrees, + int numAdditionalCells, @NonNull IS2CellIdsCallback callback) { try { - onGetCoarsenedS2Cell(latitudeDegrees, longitudeDegrees, + onGetCoarsenedS2Cells(latitudeDegrees, longitudeDegrees, numAdditionalCells, new SingleUseS2CellIdsCallback(callback)); } catch (RuntimeException e) { // exceptions on one-way binder threads are dropped - move to a different thread diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index c72a74efcff8..8bc66a048d27 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -17,6 +17,7 @@ package android.media; import static android.media.audio.Flags.FLAG_DOLBY_AC4_LEVEL4_ENCODING_API; +import static android.media.audio.Flags.FLAG_IAMF_DEFINITIONS_API; import android.annotation.FlaggedApi; import android.annotation.IntDef; @@ -382,6 +383,103 @@ public final class AudioFormat implements Parcelable { @FlaggedApi(FLAG_DOLBY_AC4_LEVEL4_ENCODING_API) public static final int ENCODING_AC4_L4 = 32; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-simple">simple profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in OPUS. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_SIMPLE_PROFILE_OPUS = 33; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-simple">simple profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in AAC. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_SIMPLE_PROFILE_AAC = 34; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-simple">simple profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in FLAC. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_SIMPLE_PROFILE_FLAC = 35; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-simple">simple profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in PCM. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_SIMPLE_PROFILE_PCM = 36; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-base">base profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in OPUS. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_BASE_PROFILE_OPUS = 37; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-base">base profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in AAC. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_BASE_PROFILE_AAC = 38; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-base">base profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in FLAC. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_BASE_PROFILE_FLAC = 39; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-base">base profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in PCM. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_BASE_PROFILE_PCM = 40; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-base-enhanced">base-enhanced profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in OPUS. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS = 41; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-base-enhanced">base-enhanced profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in AAC. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC = 42; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-base-enhanced">base-enhanced profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in FLAC. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC = 43; + /** + * Audio data format: IAMF using the + * <a href="https://aomediacodec.github.io/iamf/#profiles-base-enhanced">base-enhanced profile</a> + * with audio streams <a href="https://aomediacodec.github.io/iamf/#codec_id">encoded</a> + * in PCM. + */ + @FlaggedApi(FLAG_IAMF_DEFINITIONS_API) + public static final int ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM = 44; + /** @hide */ public static String toLogFriendlyEncoding(int enc) { switch(enc) { @@ -449,6 +547,30 @@ public final class AudioFormat implements Parcelable { return "ENCODING_DTS_UHD_P2"; case ENCODING_DSD: return "ENCODING_DSD"; + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC: + return "ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC"; + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC: + return "ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC"; + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS: + return "ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS"; + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM: + return "ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM"; + case ENCODING_IAMF_BASE_PROFILE_AAC: + return "ENCODING_IAMF_BASE_PROFILE_AAC"; + case ENCODING_IAMF_BASE_PROFILE_FLAC: + return "ENCODING_IAMF_BASE_PROFILE_FLAC"; + case ENCODING_IAMF_BASE_PROFILE_OPUS: + return "ENCODING_IAMF_BASE_PROFILE_OPUS"; + case ENCODING_IAMF_BASE_PROFILE_PCM: + return "ENCODING_IAMF_BASE_PROFILE_PCM"; + case ENCODING_IAMF_SIMPLE_PROFILE_AAC: + return "ENCODING_IAMF_SIMPLE_PROFILE_AAC"; + case ENCODING_IAMF_SIMPLE_PROFILE_FLAC: + return "ENCODING_IAMF_SIMPLE_PROFILE_FLAC"; + case ENCODING_IAMF_SIMPLE_PROFILE_OPUS: + return "ENCODING_IAMF_SIMPLE_PROFILE_OPUS"; + case ENCODING_IAMF_SIMPLE_PROFILE_PCM: + return "ENCODING_IAMF_SIMPLE_PROFILE_PCM"; default : return "invalid encoding " + enc; } @@ -931,6 +1053,18 @@ public final class AudioFormat implements Parcelable { case ENCODING_DTS_HD_MA: case ENCODING_DTS_UHD_P2: case ENCODING_DSD: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM: + case ENCODING_IAMF_BASE_PROFILE_AAC: + case ENCODING_IAMF_BASE_PROFILE_FLAC: + case ENCODING_IAMF_BASE_PROFILE_OPUS: + case ENCODING_IAMF_BASE_PROFILE_PCM: + case ENCODING_IAMF_SIMPLE_PROFILE_AAC: + case ENCODING_IAMF_SIMPLE_PROFILE_FLAC: + case ENCODING_IAMF_SIMPLE_PROFILE_OPUS: + case ENCODING_IAMF_SIMPLE_PROFILE_PCM: return true; default: return false; @@ -972,6 +1106,18 @@ public final class AudioFormat implements Parcelable { case ENCODING_DTS_HD_MA: case ENCODING_DTS_UHD_P2: case ENCODING_DSD: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM: + case ENCODING_IAMF_BASE_PROFILE_AAC: + case ENCODING_IAMF_BASE_PROFILE_FLAC: + case ENCODING_IAMF_BASE_PROFILE_OPUS: + case ENCODING_IAMF_BASE_PROFILE_PCM: + case ENCODING_IAMF_SIMPLE_PROFILE_AAC: + case ENCODING_IAMF_SIMPLE_PROFILE_FLAC: + case ENCODING_IAMF_SIMPLE_PROFILE_OPUS: + case ENCODING_IAMF_SIMPLE_PROFILE_PCM: return true; default: return false; @@ -1015,6 +1161,18 @@ public final class AudioFormat implements Parcelable { case ENCODING_DRA: case ENCODING_DTS_HD_MA: case ENCODING_DTS_UHD_P2: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM: // PCM but inside compressed stream + case ENCODING_IAMF_BASE_PROFILE_AAC: + case ENCODING_IAMF_BASE_PROFILE_FLAC: + case ENCODING_IAMF_BASE_PROFILE_OPUS: + case ENCODING_IAMF_BASE_PROFILE_PCM: // PCM but inside compressed stream + case ENCODING_IAMF_SIMPLE_PROFILE_AAC: + case ENCODING_IAMF_SIMPLE_PROFILE_FLAC: + case ENCODING_IAMF_SIMPLE_PROFILE_OPUS: + case ENCODING_IAMF_SIMPLE_PROFILE_PCM: // PCM but inside compressed stream return false; case ENCODING_INVALID: default: @@ -1058,6 +1216,18 @@ public final class AudioFormat implements Parcelable { case ENCODING_DRA: case ENCODING_DTS_HD_MA: case ENCODING_DTS_UHD_P2: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM: + case ENCODING_IAMF_BASE_PROFILE_AAC: + case ENCODING_IAMF_BASE_PROFILE_FLAC: + case ENCODING_IAMF_BASE_PROFILE_OPUS: + case ENCODING_IAMF_BASE_PROFILE_PCM: + case ENCODING_IAMF_SIMPLE_PROFILE_AAC: + case ENCODING_IAMF_SIMPLE_PROFILE_FLAC: + case ENCODING_IAMF_SIMPLE_PROFILE_OPUS: + case ENCODING_IAMF_SIMPLE_PROFILE_PCM: return false; case ENCODING_INVALID: default: @@ -1350,6 +1520,18 @@ public final class AudioFormat implements Parcelable { case ENCODING_DTS_HD_MA: case ENCODING_DTS_UHD_P2: case ENCODING_DSD: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS: + case ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM: + case ENCODING_IAMF_BASE_PROFILE_AAC: + case ENCODING_IAMF_BASE_PROFILE_FLAC: + case ENCODING_IAMF_BASE_PROFILE_OPUS: + case ENCODING_IAMF_BASE_PROFILE_PCM: + case ENCODING_IAMF_SIMPLE_PROFILE_AAC: + case ENCODING_IAMF_SIMPLE_PROFILE_FLAC: + case ENCODING_IAMF_SIMPLE_PROFILE_OPUS: + case ENCODING_IAMF_SIMPLE_PROFILE_PCM: mEncoding = encoding; break; case ENCODING_INVALID: @@ -1580,7 +1762,19 @@ public final class AudioFormat implements Parcelable { ENCODING_DRA, ENCODING_DTS_HD_MA, ENCODING_DTS_UHD_P2, - ENCODING_DSD } + ENCODING_DSD, + ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC, + ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC, + ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS, + ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM, + ENCODING_IAMF_BASE_PROFILE_AAC, + ENCODING_IAMF_BASE_PROFILE_FLAC, + ENCODING_IAMF_BASE_PROFILE_OPUS, + ENCODING_IAMF_BASE_PROFILE_PCM, + ENCODING_IAMF_SIMPLE_PROFILE_AAC, + ENCODING_IAMF_SIMPLE_PROFILE_FLAC, + ENCODING_IAMF_SIMPLE_PROFILE_OPUS, + ENCODING_IAMF_SIMPLE_PROFILE_PCM } ) @Retention(RetentionPolicy.SOURCE) public @interface Encoding {} @@ -1619,7 +1813,19 @@ public final class AudioFormat implements Parcelable { ENCODING_DRA, ENCODING_DTS_HD_MA, ENCODING_DTS_UHD_P2, - ENCODING_DSD } + ENCODING_DSD, + ENCODING_IAMF_BASE_ENHANCED_PROFILE_AAC, + ENCODING_IAMF_BASE_ENHANCED_PROFILE_FLAC, + ENCODING_IAMF_BASE_ENHANCED_PROFILE_OPUS, + ENCODING_IAMF_BASE_ENHANCED_PROFILE_PCM, + ENCODING_IAMF_BASE_PROFILE_AAC, + ENCODING_IAMF_BASE_PROFILE_FLAC, + ENCODING_IAMF_BASE_PROFILE_OPUS, + ENCODING_IAMF_BASE_PROFILE_PCM, + ENCODING_IAMF_SIMPLE_PROFILE_AAC, + ENCODING_IAMF_SIMPLE_PROFILE_FLAC, + ENCODING_IAMF_SIMPLE_PROFILE_OPUS, + ENCODING_IAMF_SIMPLE_PROFILE_PCM } ) @Retention(RetentionPolicy.SOURCE) public @interface EncodingCanBeInvalid {} diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index d0d91ba599f9..12d7f33a0d51 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -559,6 +559,30 @@ public class AudioSystem return "AUDIO_FORMAT_MPEGH_SUB_LC_L3"; case /* AUDIO_FORMAT_MPEGH_SUB_LC_L4 */ 0x2C000024: return "AUDIO_FORMAT_MPEGH_SUB_LC_L4"; + case /* AUDIO_FORMAT_IAMF_SIMPLE_OPUS */ 0x34010001: + return "AUDIO_FORMAT_IAMF_SIMPLE_OPUS"; + case /* AUDIO_FORMAT_IAMF_SIMPLE_AAC */ 0x34010002: + return "AUDIO_FORMAT_IAMF_SIMPLE_AAC"; + case /* AUDIO_FORMAT_IAMF_SIMPLE_FLAC */ 0x34010004: + return "AUDIO_FORMAT_IAMF_SIMPLE_FLAC"; + case /* AUDIO_FORMAT_IAMF_SIMPLE_PCM */ 0x34010008: + return "AUDIO_FORMAT_IAMF_SIMPLE_PCM"; + case /* AUDIO_FORMAT_IAMF_BASE_OPUS */ 0x34020001: + return "AUDIO_FORMAT_IAMF_BASE_OPUS"; + case /* AUDIO_FORMAT_IAMF_BASE_AAC */ 0x34020002: + return "AUDIO_FORMAT_IAMF_BASE_AAC"; + case /* AUDIO_FORMAT_IAMF_BASE_FLAC */ 0x34020004: + return "AUDIO_FORMAT_IAMF_BASE_FLAC"; + case /* AUDIO_FORMAT_IAMF_BASE_PCM */ 0x34020008: + return "AUDIO_FORMAT_IAMF_BASE_PCM"; + case /* AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS */ 0x34040001: + return "AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS"; + case /* AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC */ 0x34040002: + return "AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC"; + case /* AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC */ 0x34040004: + return "AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC"; + case /* AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM */ 0x34040008: + return "AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM"; default: return "AUDIO_FORMAT_(" + audioFormat + ")"; } diff --git a/media/java/android/media/MediaRoute2Info.java b/media/java/android/media/MediaRoute2Info.java index dd5067a3ee67..54f172c05b69 100644 --- a/media/java/android/media/MediaRoute2Info.java +++ b/media/java/android/media/MediaRoute2Info.java @@ -189,6 +189,7 @@ public final class MediaRoute2Info implements Parcelable { * the device. * * @see #getType + * @see AudioDeviceInfo#TYPE_BUILTIN_SPEAKER */ public static final int TYPE_BUILTIN_SPEAKER = AudioDeviceInfo.TYPE_BUILTIN_SPEAKER; @@ -196,6 +197,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is a headset, which is the combination of a headphones and a microphone. * * @see #getType + * @see AudioDeviceInfo#TYPE_WIRED_HEADSET */ public static final int TYPE_WIRED_HEADSET = AudioDeviceInfo.TYPE_WIRED_HEADSET; @@ -203,6 +205,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is a pair of wired headphones. * * @see #getType + * @see AudioDeviceInfo#TYPE_WIRED_HEADPHONES */ public static final int TYPE_WIRED_HEADPHONES = AudioDeviceInfo.TYPE_WIRED_HEADPHONES; @@ -210,6 +213,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is a bluetooth device, such as a bluetooth speaker or headphones. * * @see #getType + * @see AudioDeviceInfo#TYPE_BLUETOOTH_A2DP */ public static final int TYPE_BLUETOOTH_A2DP = AudioDeviceInfo.TYPE_BLUETOOTH_A2DP; @@ -217,6 +221,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is an HDMI connection. * * @see #getType + * @see AudioDeviceInfo#TYPE_HDMI */ public static final int TYPE_HDMI = AudioDeviceInfo.TYPE_HDMI; @@ -224,6 +229,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is an Audio Return Channel of an HDMI connection. * * @see #getType + * @see AudioDeviceInfo#TYPE_HDMI_ARC */ @FlaggedApi(FLAG_ENABLE_AUDIO_POLICIES_DEVICE_AND_BLUETOOTH_CONTROLLER) public static final int TYPE_HDMI_ARC = AudioDeviceInfo.TYPE_HDMI_ARC; @@ -232,24 +238,34 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is an Enhanced Audio Return Channel of an HDMI connection. * * @see #getType + * @see AudioDeviceInfo#TYPE_HDMI_EARC */ @FlaggedApi(FLAG_ENABLE_AUDIO_POLICIES_DEVICE_AND_BLUETOOTH_CONTROLLER) public static final int TYPE_HDMI_EARC = AudioDeviceInfo.TYPE_HDMI_EARC; /** * Indicates the route is a digital line connection (for example S/PDIF). + * + * @see #getType + * @see AudioDeviceInfo#TYPE_LINE_DIGITAL */ @FlaggedApi(FLAG_ENABLE_NEW_WIRED_MEDIA_ROUTE_2_INFO_TYPES) public static final int TYPE_LINE_DIGITAL = AudioDeviceInfo.TYPE_LINE_DIGITAL; /** * Indicates the route is an analog line-level connection. + * + * @see #getType + * @see AudioDeviceInfo#TYPE_LINE_ANALOG */ @FlaggedApi(FLAG_ENABLE_NEW_WIRED_MEDIA_ROUTE_2_INFO_TYPES) public static final int TYPE_LINE_ANALOG = AudioDeviceInfo.TYPE_LINE_ANALOG; /** * Indicates the route is using the auxiliary line-level connectors. + * + * @see #getType + * @see AudioDeviceInfo#TYPE_AUX_LINE */ @FlaggedApi(FLAG_ENABLE_NEW_WIRED_MEDIA_ROUTE_2_INFO_TYPES) public static final int TYPE_AUX_LINE = AudioDeviceInfo.TYPE_AUX_LINE; @@ -258,6 +274,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is a USB audio device. * * @see #getType + * @see AudioDeviceInfo#TYPE_USB_DEVICE */ public static final int TYPE_USB_DEVICE = AudioDeviceInfo.TYPE_USB_DEVICE; @@ -265,6 +282,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is a USB audio device in accessory mode. * * @see #getType + * @see AudioDeviceInfo#TYPE_USB_ACCESSORY */ public static final int TYPE_USB_ACCESSORY = AudioDeviceInfo.TYPE_USB_ACCESSORY; @@ -272,6 +290,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is the audio device associated with a dock. * * @see #getType + * @see AudioDeviceInfo#TYPE_DOCK */ public static final int TYPE_DOCK = AudioDeviceInfo.TYPE_DOCK; @@ -279,6 +298,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is a USB audio headset. * * @see #getType + * @see AudioDeviceInfo#TYPE_USB_HEADSET */ public static final int TYPE_USB_HEADSET = AudioDeviceInfo.TYPE_USB_HEADSET; @@ -286,6 +306,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is a hearing aid. * * @see #getType + * @see AudioDeviceInfo#TYPE_HEARING_AID */ public static final int TYPE_HEARING_AID = AudioDeviceInfo.TYPE_HEARING_AID; @@ -293,6 +314,7 @@ public final class MediaRoute2Info implements Parcelable { * Indicates the route is a Bluetooth Low Energy (BLE) HEADSET. * * @see #getType + * @see AudioDeviceInfo#TYPE_BLE_HEADSET */ public static final int TYPE_BLE_HEADSET = AudioDeviceInfo.TYPE_BLE_HEADSET; @@ -304,6 +326,7 @@ public final class MediaRoute2Info implements Parcelable { * to provide a better experience on multichannel contents. * * @see #getType + * @see AudioDeviceInfo#TYPE_MULTICHANNEL_GROUP */ @FlaggedApi(FLAG_ENABLE_MULTICHANNEL_GROUP_DEVICE) public static final int TYPE_MULTICHANNEL_SPEAKER_GROUP = diff --git a/media/java/android/media/projection/MediaProjection.java b/media/java/android/media/projection/MediaProjection.java index f7f10df5786a..4f7132ad9ab2 100644 --- a/media/java/android/media/projection/MediaProjection.java +++ b/media/java/android/media/projection/MediaProjection.java @@ -324,6 +324,19 @@ public final class MediaProjection { } /** + * Stops projection. + * @hide + */ + public void stop(@StopReason int stopReason) { + try { + Log.d(TAG, "Content Recording: stopping projection"); + mImpl.stop(stopReason); + } catch (RemoteException e) { + Log.e(TAG, "Unable to stop projection", e); + } + } + + /** * Get the underlying IMediaProjection. * @hide */ diff --git a/media/java/android/media/quality/AmbientBacklightMetadata.java b/media/java/android/media/quality/AmbientBacklightMetadata.java index ad19d0456ab0..c295946e50aa 100644 --- a/media/java/android/media/quality/AmbientBacklightMetadata.java +++ b/media/java/android/media/quality/AmbientBacklightMetadata.java @@ -110,9 +110,10 @@ public final class AmbientBacklightMetadata implements Parcelable { /** * Gets the number of horizontal color zones. * - * <p>A color zone is a group of lights that always display the same color. + * <p>A color zone is represented by one single aggregated color. The number should not be + * larger than 128. */ - @IntRange(from = 0) + @IntRange(from = 0, to = 128) public int getHorizontalZonesNumber() { return mHorizontalZonesNumber; } @@ -120,9 +121,10 @@ public final class AmbientBacklightMetadata implements Parcelable { /** * Gets the number of vertical color zones. * - * <p>A color zone is a group of lights that always display the same color. + * <p>A color zone is represented by one single aggregated color. The number should not be + * larger than 80. */ - @IntRange(from = 0) + @IntRange(from = 0, to = 80) public int getVerticalZonesNumber() { return mVerticalZonesNumber; } diff --git a/media/java/android/media/quality/IMediaQualityManager.aidl b/media/java/android/media/quality/IMediaQualityManager.aidl index dc3fbf60c0b3..9daebca98e3e 100644 --- a/media/java/android/media/quality/IMediaQualityManager.aidl +++ b/media/java/android/media/quality/IMediaQualityManager.aidl @@ -23,6 +23,7 @@ import android.media.quality.ISoundProfileCallback; import android.media.quality.ParamCapability; import android.media.quality.PictureProfileHandle; import android.media.quality.PictureProfile; +import android.media.quality.SoundProfileHandle; import android.media.quality.SoundProfile; /** @@ -36,10 +37,11 @@ interface IMediaQualityManager { PictureProfile getPictureProfile(in int type, in String name, int userId); List<PictureProfile> getPictureProfilesByPackage(in String packageName, int userId); List<PictureProfile> getAvailablePictureProfiles(int userId); + boolean setDefaultPictureProfile(in String id, int userId); List<String> getPictureProfilePackageNames(int userId); List<String> getPictureProfileAllowList(int userId); void setPictureProfileAllowList(in List<String> packages, int userId); - PictureProfileHandle getPictureProfileHandle(in String id, int userId); + List<PictureProfileHandle> getPictureProfileHandle(in String[] id, int userId); SoundProfile createSoundProfile(in SoundProfile pp, int userId); void updateSoundProfile(in String id, in SoundProfile pp, int userId); @@ -47,9 +49,11 @@ interface IMediaQualityManager { SoundProfile getSoundProfile(in int type, in String name, int userId); List<SoundProfile> getSoundProfilesByPackage(in String packageName, int userId); List<SoundProfile> getAvailableSoundProfiles(int userId); + boolean setDefaultSoundProfile(in String id, int userId); List<String> getSoundProfilePackageNames(int userId); List<String> getSoundProfileAllowList(int userId); void setSoundProfileAllowList(in List<String> packages, int userId); + List<SoundProfileHandle> getSoundProfileHandle(in String[] id, int userId); void registerPictureProfileCallback(in IPictureProfileCallback cb); void registerSoundProfileCallback(in ISoundProfileCallback cb); diff --git a/media/java/android/media/quality/MediaQualityManager.java b/media/java/android/media/quality/MediaQualityManager.java index d4de99aadb14..efbe47ba2f22 100644 --- a/media/java/android/media/quality/MediaQualityManager.java +++ b/media/java/android/media/quality/MediaQualityManager.java @@ -257,6 +257,24 @@ public final class MediaQualityManager { } /** + * Sets preferred default picture profile. + * + * @param id the ID of the default profile. {@code null} to unset the default profile. + * @return {@code true} if it's set successfully; {@code false} otherwise. + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE) + public boolean setDefaultPictureProfile(@Nullable String id) { + try { + return mService.setDefaultPictureProfile(id, mUserId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Gets all package names whose picture profiles are available. * * @see #getPictureProfilesByPackage(String) @@ -277,7 +295,7 @@ public final class MediaQualityManager { * Gets picture profile handle by profile ID. * @hide */ - public PictureProfileHandle getPictureProfileHandle(String id) { + public List<PictureProfileHandle> getPictureProfileHandle(String[] id) { try { return mService.getPictureProfileHandle(id, mUserId); } catch (RemoteException e) { @@ -286,6 +304,18 @@ public final class MediaQualityManager { } /** + * Gets sound profile handle by profile ID. + * @hide + */ + public List<SoundProfileHandle> getSoundProfileHandle(String[] id) { + try { + return mService.getSoundProfileHandle(id, mUserId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Creates a picture profile and store it in the system. * * <p>If the profile is created successfully, @@ -400,6 +430,24 @@ public final class MediaQualityManager { } /** + * Sets preferred default sound profile. + * + * @param id the ID of the default profile. {@code null} to unset the default profile. + * @return {@code true} if it's set successfully; {@code false} otherwise. + * + * @hide + */ + @SystemApi + @RequiresPermission(android.Manifest.permission.MANAGE_GLOBAL_SOUND_QUALITY_SERVICE) + public boolean setDefaultSoundProfile(@Nullable String id) { + try { + return mService.setDefaultSoundProfile(id, mUserId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Gets all package names whose sound profiles are available. * * @see #getSoundProfilesByPackage(String) @@ -633,6 +681,7 @@ public final class MediaQualityManager { /** * Registers a {@link AmbientBacklightCallback}. */ + @RequiresPermission(android.Manifest.permission.READ_COLOR_ZONES) public void registerAmbientBacklightCallback( @NonNull @CallbackExecutor Executor executor, @NonNull AmbientBacklightCallback callback) { @@ -646,6 +695,7 @@ public final class MediaQualityManager { /** * Unregisters the existing {@link AmbientBacklightCallback}. */ + @RequiresPermission(android.Manifest.permission.READ_COLOR_ZONES) public void unregisterAmbientBacklightCallback( @NonNull final AmbientBacklightCallback callback) { Preconditions.checkNotNull(callback); @@ -666,6 +716,7 @@ public final class MediaQualityManager { * * @param settings The settings to use for the backlight detector. */ + @RequiresPermission(android.Manifest.permission.READ_COLOR_ZONES) public void setAmbientBacklightSettings( @NonNull AmbientBacklightSettings settings) { Preconditions.checkNotNull(settings); @@ -692,6 +743,7 @@ public final class MediaQualityManager { * * @param enabled {@code true} to enable, {@code false} to disable. */ + @RequiresPermission(android.Manifest.permission.READ_COLOR_ZONES) public void setAmbientBacklightEnabled(boolean enabled) { try { mService.setAmbientBacklightEnabled(enabled, mUserId); diff --git a/media/java/android/media/quality/PictureProfile.java b/media/java/android/media/quality/PictureProfile.java index dcb4222c3eaf..6064485c1c38 100644 --- a/media/java/android/media/quality/PictureProfile.java +++ b/media/java/android/media/quality/PictureProfile.java @@ -48,6 +48,7 @@ public final class PictureProfile implements Parcelable { private final String mPackageName; @NonNull private final PersistableBundle mParams; + private final PictureProfileHandle mHandle; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -121,6 +122,7 @@ public final class PictureProfile implements Parcelable { mInputId = in.readString(); mPackageName = in.readString(); mParams = in.readPersistableBundle(); + mHandle = in.readParcelable(PictureProfileHandle.class.getClassLoader()); } @Override @@ -131,6 +133,7 @@ public final class PictureProfile implements Parcelable { dest.writeString(mInputId); dest.writeString(mPackageName); dest.writePersistableBundle(mParams); + dest.writeParcelable(mHandle, flags); } @Override @@ -163,13 +166,15 @@ public final class PictureProfile implements Parcelable { @NonNull String name, @Nullable String inputId, @NonNull String packageName, - @NonNull PersistableBundle params) { + @NonNull PersistableBundle params, + @NonNull PictureProfileHandle handle) { this.mId = id; this.mType = type; this.mName = name; this.mInputId = inputId; this.mPackageName = packageName; this.mParams = params; + this.mHandle = handle; } /** @@ -251,6 +256,15 @@ public final class PictureProfile implements Parcelable { } /** + * Gets profile handle + * @hide + */ + @NonNull + public PictureProfileHandle getHandle() { + return mHandle; + } + + /** * A builder for {@link PictureProfile}. */ public static final class Builder { @@ -265,6 +279,7 @@ public final class PictureProfile implements Parcelable { private String mPackageName; @NonNull private PersistableBundle mParams; + private PictureProfileHandle mHandle; /** * Creates a new Builder. @@ -283,6 +298,7 @@ public final class PictureProfile implements Parcelable { mPackageName = p.getPackageName(); mInputId = p.getInputId(); mParams = p.getParameters(); + mHandle = p.getHandle(); } /** @@ -350,6 +366,16 @@ public final class PictureProfile implements Parcelable { } /** + * Sets profile handle. + * @hide + */ + @NonNull + public Builder setHandle(@NonNull PictureProfileHandle handle) { + mHandle = handle; + return this; + } + + /** * Builds the instance. */ @NonNull @@ -361,7 +387,8 @@ public final class PictureProfile implements Parcelable { mName, mInputId, mPackageName, - mParams); + mParams, + mHandle); return o; } } diff --git a/media/java/android/media/quality/SoundProfile.java b/media/java/android/media/quality/SoundProfile.java index c7fb4dd8486f..1dd59ab0903b 100644 --- a/media/java/android/media/quality/SoundProfile.java +++ b/media/java/android/media/quality/SoundProfile.java @@ -48,6 +48,7 @@ public final class SoundProfile implements Parcelable { private final String mPackageName; @NonNull private final PersistableBundle mParams; + private final SoundProfileHandle mHandle; /** @hide */ @Retention(RetentionPolicy.SOURCE) @@ -120,6 +121,7 @@ public final class SoundProfile implements Parcelable { mInputId = in.readString(); mPackageName = in.readString(); mParams = in.readPersistableBundle(); + mHandle = in.readParcelable(SoundProfileHandle.class.getClassLoader()); } @Override @@ -130,6 +132,7 @@ public final class SoundProfile implements Parcelable { dest.writeString(mInputId); dest.writeString(mPackageName); dest.writePersistableBundle(mParams); + dest.writeParcelable(mHandle, flags); } @Override @@ -162,13 +165,15 @@ public final class SoundProfile implements Parcelable { @NonNull String name, @Nullable String inputId, @NonNull String packageName, - @NonNull PersistableBundle params) { + @NonNull PersistableBundle params, + @NonNull SoundProfileHandle handle) { this.mId = id; this.mType = type; this.mName = name; this.mInputId = inputId; this.mPackageName = packageName; this.mParams = params; + this.mHandle = handle; } /** @@ -250,6 +255,15 @@ public final class SoundProfile implements Parcelable { } /** + * Gets profile handle + * @hide + */ + @NonNull + public SoundProfileHandle getHandle() { + return mHandle; + } + + /** * A builder for {@link SoundProfile} */ public static final class Builder { @@ -264,6 +278,7 @@ public final class SoundProfile implements Parcelable { private String mPackageName; @NonNull private PersistableBundle mParams; + private SoundProfileHandle mHandle; /** * Creates a new Builder. @@ -282,6 +297,7 @@ public final class SoundProfile implements Parcelable { mPackageName = p.getPackageName(); mInputId = p.getInputId(); mParams = p.getParameters(); + mHandle = p.getHandle(); } /** @@ -349,6 +365,16 @@ public final class SoundProfile implements Parcelable { } /** + * Sets profile handle. + * @hide + */ + @NonNull + public Builder setHandle(@NonNull SoundProfileHandle handle) { + mHandle = handle; + return this; + } + + /** * Builds the instance. */ @NonNull @@ -360,7 +386,8 @@ public final class SoundProfile implements Parcelable { mName, mInputId, mPackageName, - mParams); + mParams, + mHandle); return o; } } diff --git a/media/java/android/media/quality/SoundProfileHandle.aidl b/media/java/android/media/quality/SoundProfileHandle.aidl new file mode 100644 index 000000000000..6b8161c8cc43 --- /dev/null +++ b/media/java/android/media/quality/SoundProfileHandle.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.media.quality; + +parcelable SoundProfileHandle; diff --git a/media/java/android/media/quality/SoundProfileHandle.java b/media/java/android/media/quality/SoundProfileHandle.java new file mode 100644 index 000000000000..edb546efdaf3 --- /dev/null +++ b/media/java/android/media/quality/SoundProfileHandle.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.media.quality; + +import android.annotation.NonNull; +import android.os.Parcel; +import android.os.Parcelable; + +/** + * A type-safe handle to a sound profile. + * + * @hide + */ +public final class SoundProfileHandle implements Parcelable { + public static final @NonNull SoundProfileHandle NONE = new SoundProfileHandle(-1000); + + private final long mId; + + /** @hide */ + public SoundProfileHandle(long id) { + mId = id; + } + + /** @hide */ + public long getId() { + return mId; + } + + /** @hide */ + @Override + public void writeToParcel(@NonNull Parcel dest, int flags) { + dest.writeLong(mId); + } + + /** @hide */ + @Override + public int describeContents() { + return 0; + } + + /** @hide */ + public static final @NonNull Creator<SoundProfileHandle> CREATOR = + new Creator<SoundProfileHandle>() { + @Override + public SoundProfileHandle createFromParcel(Parcel in) { + return new SoundProfileHandle(in); + } + + @Override + public SoundProfileHandle[] newArray(int size) { + return new SoundProfileHandle[size]; + } + }; + + private SoundProfileHandle(@NonNull Parcel in) { + mId = in.readLong(); + } +} diff --git a/native/android/Android.bp b/native/android/Android.bp index cd6de5a5c8f0..129d6163010e 100644 --- a/native/android/Android.bp +++ b/native/android/Android.bp @@ -73,6 +73,7 @@ cc_library_shared { "surface_control.cpp", "surface_texture.cpp", "system_fonts.cpp", + "system_health.cpp", "trace.cpp", "thermal.cpp", ], diff --git a/native/android/display_luts.cpp b/native/android/display_luts.cpp index 179a32bd1c03..b03a718d4a65 100644 --- a/native/android/display_luts.cpp +++ b/native/android/display_luts.cpp @@ -26,8 +26,9 @@ #define CHECK_NOT_NULL(name) \ LOG_ALWAYS_FATAL_IF(name == nullptr, "nullptr passed as " #name " argument"); -ADisplayLutsEntry* ADisplayLutsEntry_createEntry(float* buffer, int32_t length, int32_t dimension, - int32_t key) { +ADisplayLutsEntry* ADisplayLutsEntry_createEntry(float* buffer, int32_t length, + ADisplayLuts_Dimension dimension, + ADisplayLuts_SamplingKey key) { CHECK_NOT_NULL(buffer); LOG_ALWAYS_FATAL_IF(length >= ADISPLAYLUTS_BUFFER_LENGTH_LIMIT, "the lut raw buffer length is too big to handle"); @@ -64,7 +65,7 @@ void ADisplayLutsEntry_destroy(ADisplayLutsEntry* entry) { ADisplayLuts_Dimension ADisplayLutsEntry_getDimension(const ADisplayLutsEntry* entry) { CHECK_NOT_NULL(entry); - return static_cast<ADisplayLuts_Dimension>(entry->properties.dimension); + return entry->properties.dimension; } int32_t ADisplayLutsEntry_getSize(const ADisplayLutsEntry* entry) { @@ -74,7 +75,7 @@ int32_t ADisplayLutsEntry_getSize(const ADisplayLutsEntry* entry) { ADisplayLuts_SamplingKey ADisplayLutsEntry_getSamplingKey(const ADisplayLutsEntry* entry) { CHECK_NOT_NULL(entry); - return static_cast<ADisplayLuts_SamplingKey>(entry->properties.samplingKey); + return entry->properties.samplingKey; } const float* ADisplayLutsEntry_getBuffer(const ADisplayLutsEntry* _Nonnull entry) { diff --git a/native/android/libandroid.map.txt b/native/android/libandroid.map.txt index e8644ee1a73c..8dd8830cb490 100644 --- a/native/android/libandroid.map.txt +++ b/native/android/libandroid.map.txt @@ -320,6 +320,23 @@ LIBANDROID { ASystemFontIterator_open; # introduced=29 ASystemFontIterator_close; # introduced=29 ASystemFontIterator_next; # introduced=29 + ASystemHealth_getCpuHeadroom; # introduced=36 + ASystemHealth_getGpuHeadroom; # introduced=36 + ASystemHealth_getCpuHeadroomMinIntervalMillis; # introduced=36 + ASystemHealth_getGpuHeadroomMinIntervalMillis; # introduced=36 + ACpuHeadroomParams_create; # introduced=36 + ACpuHeadroomParams_destroy; # introduced=36 + ACpuHeadroomParams_setCalculationType; # introduced=36 + ACpuHeadroomParams_getCalculationType; # introduced=36 + ACpuHeadroomParams_setCalculationWindowMillis; # introduced=36 + ACpuHeadroomParams_getCalculationWindowMillis; # introduced=36 + ACpuHeadroomParams_setTids; # introduced=36 + AGpuHeadroomParams_create; # introduced=36 + AGpuHeadroomParams_destroy; # introduced=36 + AGpuHeadroomParams_setCalculationType; # introduced=36 + AGpuHeadroomParams_getCalculationType; # introduced=36 + AGpuHeadroomParams_setCalculationWindowMillis; # introduced=36 + AGpuHeadroomParams_getCalculationWindowMillis; # introduced=36 AFont_close; # introduced=29 AFont_getFontFilePath; # introduced=29 AFont_getWeight; # introduced=29 @@ -361,6 +378,8 @@ LIBANDROID { AThermal_unregisterThermalStatusListener; # introduced=30 AThermal_getThermalHeadroom; # introduced=31 AThermal_getThermalHeadroomThresholds; # introduced=VanillaIceCream + AThermal_registerThermalHeadroomListener; # introduced=36 + AThermal_unregisterThermalHeadroomListener; # introduced=36 APerformanceHint_getManager; # introduced=Tiramisu APerformanceHint_createSession; # introduced=Tiramisu APerformanceHint_getPreferredUpdateRateNanos; # introduced=Tiramisu diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp index 6bca1456db3a..4fe0b80f3951 100644 --- a/native/android/surface_control.cpp +++ b/native/android/surface_control.cpp @@ -64,6 +64,8 @@ static_assert(static_cast<int>(ADISPLAYLUTS_SAMPLINGKEY_RGB) == static_cast<int>(android::gui::LutProperties::SamplingKey::RGB)); static_assert(static_cast<int>(ADISPLAYLUTS_SAMPLINGKEY_MAX_RGB) == static_cast<int>(android::gui::LutProperties::SamplingKey::MAX_RGB)); +static_assert(static_cast<int>(ADISPLAYLUTS_SAMPLINGKEY_CIE_Y) == + static_cast<int>(android::gui::LutProperties::SamplingKey::CIE_Y)); Transaction* ASurfaceTransaction_to_Transaction(ASurfaceTransaction* aSurfaceTransaction) { return reinterpret_cast<Transaction*>(aSurfaceTransaction); diff --git a/native/android/system_health.cpp b/native/android/system_health.cpp new file mode 100644 index 000000000000..f3fa9f6836d5 --- /dev/null +++ b/native/android/system_health.cpp @@ -0,0 +1,278 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <aidl/android/hardware/power/CpuHeadroomParams.h> +#include <aidl/android/hardware/power/GpuHeadroomParams.h> +#include <aidl/android/os/CpuHeadroomParamsInternal.h> +#include <aidl/android/os/GpuHeadroomParamsInternal.h> +#include <aidl/android/os/IHintManager.h> +#include <android/binder_manager.h> +#include <android/system_health.h> +#include <binder/IServiceManager.h> +#include <binder/Status.h> + +using namespace android; +using namespace aidl::android::os; +namespace hal = aidl::android::hardware::power; + +struct ACpuHeadroomParams : public CpuHeadroomParamsInternal {}; +struct AGpuHeadroomParams : public GpuHeadroomParamsInternal {}; + +const int CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN = 50; +const int CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX = 10000; +const int GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN = 50; +const int GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX = 10000; +const int CPU_HEADROOM_MAX_TID_COUNT = 5; + +struct ASystemHealthManager { +public: + static ASystemHealthManager* getInstance(); + ASystemHealthManager(std::shared_ptr<IHintManager>& hintManager); + ASystemHealthManager() = delete; + ~ASystemHealthManager(); + int getCpuHeadroom(const ACpuHeadroomParams* params, float* outHeadroom); + int getGpuHeadroom(const AGpuHeadroomParams* params, float* outHeadroom); + int getCpuHeadroomMinIntervalMillis(int64_t* outMinIntervalMillis); + int getGpuHeadroomMinIntervalMillis(int64_t* outMinIntervalMillis); + +private: + static ASystemHealthManager* create(std::shared_ptr<IHintManager> hintManager); + std::shared_ptr<IHintManager> mHintManager; +}; + +ASystemHealthManager* ASystemHealthManager::getInstance() { + static std::once_flag creationFlag; + static ASystemHealthManager* instance = nullptr; + std::call_once(creationFlag, []() { instance = create(nullptr); }); + return instance; +} + +ASystemHealthManager::ASystemHealthManager(std::shared_ptr<IHintManager>& hintManager) + : mHintManager(std::move(hintManager)) {} + +ASystemHealthManager::~ASystemHealthManager() {} + +ASystemHealthManager* ASystemHealthManager::create(std::shared_ptr<IHintManager> hintManager) { + if (!hintManager) { + hintManager = IHintManager::fromBinder( + ndk::SpAIBinder(AServiceManager_waitForService("performance_hint"))); + } + if (hintManager == nullptr) { + ALOGE("%s: PerformanceHint service is not ready ", __FUNCTION__); + return nullptr; + } + return new ASystemHealthManager(hintManager); +} + +ASystemHealthManager* ASystemHealth_acquireManager() { + return ASystemHealthManager::getInstance(); +} + +int ASystemHealthManager::getCpuHeadroom(const ACpuHeadroomParams* params, float* outHeadroom) { + std::optional<hal::CpuHeadroomResult> res; + ::ndk::ScopedAStatus ret; + CpuHeadroomParamsInternal internalParams; + if (!params) { + ret = mHintManager->getCpuHeadroom(internalParams, &res); + } else { + ret = mHintManager->getCpuHeadroom(*params, &res); + } + if (!ret.isOk()) { + LOG_ALWAYS_FATAL_IF(ret.getExceptionCode() == EX_ILLEGAL_ARGUMENT, + "Invalid ACpuHeadroomParams: %s", ret.getMessage()); + ALOGE("ASystemHealth_getCpuHeadroom fails: %s", ret.getMessage()); + if (ret.getExceptionCode() == EX_UNSUPPORTED_OPERATION) { + return ENOTSUP; + } else if (ret.getExceptionCode() == EX_SECURITY) { + return EPERM; + } + return EPIPE; + } + *outHeadroom = res->get<hal::CpuHeadroomResult::Tag::globalHeadroom>(); + return OK; +} + +int ASystemHealthManager::getGpuHeadroom(const AGpuHeadroomParams* params, float* outHeadroom) { + std::optional<hal::GpuHeadroomResult> res; + ::ndk::ScopedAStatus ret; + GpuHeadroomParamsInternal internalParams; + if (!params) { + ret = mHintManager->getGpuHeadroom(internalParams, &res); + } else { + ret = mHintManager->getGpuHeadroom(*params, &res); + } + if (!ret.isOk()) { + LOG_ALWAYS_FATAL_IF(ret.getExceptionCode() == EX_ILLEGAL_ARGUMENT, + "Invalid AGpuHeadroomParams: %s", ret.getMessage()); + ALOGE("ASystemHealth_getGpuHeadroom fails: %s", ret.getMessage()); + if (ret.getExceptionCode() == EX_UNSUPPORTED_OPERATION) { + return ENOTSUP; + } + return EPIPE; + } + *outHeadroom = res->get<hal::GpuHeadroomResult::Tag::globalHeadroom>(); + return OK; +} + +int ASystemHealthManager::getCpuHeadroomMinIntervalMillis(int64_t* outMinIntervalMillis) { + int64_t minIntervalMillis = 0; + ::ndk::ScopedAStatus ret = mHintManager->getCpuHeadroomMinIntervalMillis(&minIntervalMillis); + if (!ret.isOk()) { + ALOGE("ASystemHealth_getCpuHeadroomMinIntervalMillis fails: %s", ret.getMessage()); + if (ret.getExceptionCode() == EX_UNSUPPORTED_OPERATION) { + return ENOTSUP; + } + return EPIPE; + } + *outMinIntervalMillis = minIntervalMillis; + return OK; +} + +int ASystemHealthManager::getGpuHeadroomMinIntervalMillis(int64_t* outMinIntervalMillis) { + int64_t minIntervalMillis = 0; + ::ndk::ScopedAStatus ret = mHintManager->getGpuHeadroomMinIntervalMillis(&minIntervalMillis); + if (!ret.isOk()) { + ALOGE("ASystemHealth_getGpuHeadroomMinIntervalMillis fails: %s", ret.getMessage()); + if (ret.getExceptionCode() == EX_UNSUPPORTED_OPERATION) { + return ENOTSUP; + } + return EPIPE; + } + *outMinIntervalMillis = minIntervalMillis; + return OK; +} + +int ASystemHealth_getCpuHeadroom(const ACpuHeadroomParams* _Nullable params, + float* _Nonnull outHeadroom) { + LOG_ALWAYS_FATAL_IF(outHeadroom == nullptr, "%s: outHeadroom should not be null", __FUNCTION__); + auto manager = ASystemHealthManager::getInstance(); + if (manager == nullptr) return ENOTSUP; + return manager->getCpuHeadroom(params, outHeadroom); +} + +int ASystemHealth_getGpuHeadroom(const AGpuHeadroomParams* _Nullable params, + float* _Nonnull outHeadroom) { + LOG_ALWAYS_FATAL_IF(outHeadroom == nullptr, "%s: outHeadroom should not be null", __FUNCTION__); + auto manager = ASystemHealthManager::getInstance(); + if (manager == nullptr) return ENOTSUP; + return manager->getGpuHeadroom(params, outHeadroom); +} + +int ASystemHealth_getCpuHeadroomMinIntervalMillis(int64_t* _Nonnull outMinIntervalMillis) { + LOG_ALWAYS_FATAL_IF(outMinIntervalMillis == nullptr, + "%s: outMinIntervalMillis should not be null", __FUNCTION__); + auto manager = ASystemHealthManager::getInstance(); + if (manager == nullptr) return ENOTSUP; + return manager->getCpuHeadroomMinIntervalMillis(outMinIntervalMillis); +} + +int ASystemHealth_getGpuHeadroomMinIntervalMillis(int64_t* _Nonnull outMinIntervalMillis) { + LOG_ALWAYS_FATAL_IF(outMinIntervalMillis == nullptr, + "%s: outMinIntervalMillis should not be null", __FUNCTION__); + auto manager = ASystemHealthManager::getInstance(); + if (manager == nullptr) return ENOTSUP; + return manager->getGpuHeadroomMinIntervalMillis(outMinIntervalMillis); +} + +void ACpuHeadroomParams_setCalculationWindowMillis(ACpuHeadroomParams* _Nonnull params, + int windowMillis) { + LOG_ALWAYS_FATAL_IF(windowMillis < CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN || + windowMillis > CPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX, + "%s: windowMillis should be in range [50, 10000] but got %d", __FUNCTION__, + windowMillis); + params->calculationWindowMillis = windowMillis; +} + +void AGpuHeadroomParams_setCalculationWindowMillis(AGpuHeadroomParams* _Nonnull params, + int windowMillis) { + LOG_ALWAYS_FATAL_IF(windowMillis < GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MIN || + windowMillis > GPU_HEADROOM_CALCULATION_WINDOW_MILLIS_MAX, + "%s: windowMillis should be in range [50, 10000] but got %d", __FUNCTION__, + windowMillis); + params->calculationWindowMillis = windowMillis; +} + +int ACpuHeadroomParams_getCalculationWindowMillis(ACpuHeadroomParams* _Nonnull params) { + return params->calculationWindowMillis; +} + +int AGpuHeadroomParams_getCalculationWindowMillis(AGpuHeadroomParams* _Nonnull params) { + return params->calculationWindowMillis; +} + +void ACpuHeadroomParams_setTids(ACpuHeadroomParams* _Nonnull params, const int* _Nonnull tids, + int tidsSize) { + LOG_ALWAYS_FATAL_IF(tids == nullptr, "%s: tids should not be null", __FUNCTION__); + LOG_ALWAYS_FATAL_IF(tidsSize > CPU_HEADROOM_MAX_TID_COUNT, "%s: tids size should not exceed 5", + __FUNCTION__); + params->tids.resize(tidsSize); + params->tids.clear(); + for (int i = 0; i < tidsSize; ++i) { + LOG_ALWAYS_FATAL_IF(tids[i] <= 0, "ACpuHeadroomParams_setTids: Invalid non-positive tid %d", + tids[i]); + params->tids[i] = tids[i]; + } +} + +void ACpuHeadroomParams_setCalculationType(ACpuHeadroomParams* _Nonnull params, + ACpuHeadroomCalculationType calculationType) { + LOG_ALWAYS_FATAL_IF(calculationType < ACpuHeadroomCalculationType:: + ACPU_HEADROOM_CALCULATION_TYPE_MIN || + calculationType > ACpuHeadroomCalculationType:: + ACPU_HEADROOM_CALCULATION_TYPE_AVERAGE, + "%s: calculationType should be one of ACpuHeadroomCalculationType values " + "but got %d", + __FUNCTION__, calculationType); + params->calculationType = static_cast<hal::CpuHeadroomParams::CalculationType>(calculationType); +} + +ACpuHeadroomCalculationType ACpuHeadroomParams_getCalculationType( + ACpuHeadroomParams* _Nonnull params) { + return static_cast<ACpuHeadroomCalculationType>(params->calculationType); +} + +void AGpuHeadroomParams_setCalculationType(AGpuHeadroomParams* _Nonnull params, + AGpuHeadroomCalculationType calculationType) { + LOG_ALWAYS_FATAL_IF(calculationType < AGpuHeadroomCalculationType:: + AGPU_HEADROOM_CALCULATION_TYPE_MIN || + calculationType > AGpuHeadroomCalculationType:: + AGPU_HEADROOM_CALCULATION_TYPE_AVERAGE, + "%s: calculationType should be one of AGpuHeadroomCalculationType values " + "but got %d", + __FUNCTION__, calculationType); + params->calculationType = static_cast<hal::GpuHeadroomParams::CalculationType>(calculationType); +} + +AGpuHeadroomCalculationType AGpuHeadroomParams_getCalculationType( + AGpuHeadroomParams* _Nonnull params) { + return static_cast<AGpuHeadroomCalculationType>(params->calculationType); +} + +ACpuHeadroomParams* _Nonnull ACpuHeadroomParams_create() { + return new ACpuHeadroomParams(); +} + +AGpuHeadroomParams* _Nonnull AGpuHeadroomParams_create() { + return new AGpuHeadroomParams(); +} + +void ACpuHeadroomParams_destroy(ACpuHeadroomParams* _Nonnull params) { + delete params; +} + +void AGpuHeadroomParams_destroy(AGpuHeadroomParams* _Nonnull params) { + delete params; +} diff --git a/native/android/tests/thermal/NativeThermalUnitTest.cpp b/native/android/tests/thermal/NativeThermalUnitTest.cpp index 4e319fc41d7c..923ad011de41 100644 --- a/native/android/tests/thermal/NativeThermalUnitTest.cpp +++ b/native/android/tests/thermal/NativeThermalUnitTest.cpp @@ -77,12 +77,62 @@ public: (override)); }; +struct HeadroomCallbackData { + void* data; + float headroom; + float forecast; + int32_t forecastSeconds; + const std::vector<float> thresholds; +}; + +struct StatusCallbackData { + void* data; + AThermalStatus status; +}; + +static std::optional<HeadroomCallbackData> headroomCalled1; +static std::optional<HeadroomCallbackData> headroomCalled2; +static std::optional<StatusCallbackData> statusCalled1; +static std::optional<StatusCallbackData> statusCalled2; + +static std::vector<float> convertThresholds(const AThermalHeadroomThreshold* thresholds, + size_t size) { + std::vector<float> ret; + for (int i = 0; i < (int)size; i++) { + ret.emplace_back(thresholds[i].headroom); + } + return ret; +}; + +static void onHeadroomChange1(void* data, float headroom, float forecast, int32_t forecastSeconds, + const AThermalHeadroomThreshold* thresholds, size_t size) { + headroomCalled1.emplace(data, headroom, forecast, forecastSeconds, + convertThresholds(thresholds, size)); +} + +static void onHeadroomChange2(void* data, float headroom, float forecast, int32_t forecastSeconds, + const AThermalHeadroomThreshold* thresholds, size_t size) { + headroomCalled2.emplace(data, headroom, forecast, forecastSeconds, + convertThresholds(thresholds, size)); +} + +static void onStatusChange1(void* data, AThermalStatus status) { + statusCalled1.emplace(data, status); +} +static void onStatusChange2(void* data, AThermalStatus status) { + statusCalled2.emplace(data, status); +} + class NativeThermalUnitTest : public Test { public: void SetUp() override { mMockIThermalService = new StrictMock<MockIThermalService>(); AThermal_setIThermalServiceForTesting(mMockIThermalService); mThermalManager = AThermal_acquireManager(); + headroomCalled1.reset(); + headroomCalled2.reset(); + statusCalled1.reset(); + statusCalled2.reset(); } void TearDown() override { @@ -117,9 +167,11 @@ TEST_F(NativeThermalUnitTest, TestGetThermalHeadroomThresholds) { size_t size1; ASSERT_EQ(OK, AThermal_getThermalHeadroomThresholds(mThermalManager, &thresholds1, &size1)); checkThermalHeadroomThresholds(expected, thresholds1, size1); - // following calls should be cached - EXPECT_CALL(*mMockIThermalService, getThermalHeadroomThresholds(_)).Times(0); - + // following calls should not be cached + expected = {10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}; + EXPECT_CALL(*mMockIThermalService, getThermalHeadroomThresholds(_)) + .Times(Exactly(1)) + .WillRepeatedly(DoAll(SetArgPointee<0>(expected), Return(Status()))); const AThermalHeadroomThreshold* thresholds2 = nullptr; size_t size2; ASSERT_EQ(OK, AThermal_getThermalHeadroomThresholds(mThermalManager, &thresholds2, &size2)); @@ -164,3 +216,248 @@ TEST_F(NativeThermalUnitTest, TestGetThermalHeadroomThresholdsFailedWithNonEmpty ASSERT_EQ(EINVAL, AThermal_getThermalHeadroomThresholds(mThermalManager, &initialized, &size)); delete[] initialized; } + +TEST_F(NativeThermalUnitTest, TestRegisterThermalHeadroomListener) { + EXPECT_CALL(*mMockIThermalService, registerThermalHeadroomListener(_, _)) + .Times(Exactly(2)) + .WillOnce(Return( + Status::fromExceptionCode(binder::Status::Exception::EX_TRANSACTION_FAILED))); + float data1 = 1.0f; + float data2 = 2.0f; + ASSERT_EQ(EPIPE, + AThermal_registerThermalHeadroomListener(mThermalManager, onHeadroomChange1, &data1)); + ASSERT_EQ(EPIPE, + AThermal_registerThermalHeadroomListener(mThermalManager, onHeadroomChange2, &data2)); + + // verify only 1 service call to register a global listener + sp<IThermalHeadroomListener> capturedServiceListener; + Mock::VerifyAndClearExpectations(mMockIThermalService); + EXPECT_CALL(*mMockIThermalService, registerThermalHeadroomListener(_, _)) + .Times(Exactly(1)) + .WillOnce(DoAll(testing::SaveArg<0>(&capturedServiceListener), + testing::Invoke([](const sp<IThermalHeadroomListener>&, + bool* aidl_return) { *aidl_return = true; }), + Return(Status::ok()))); + ASSERT_EQ(0, + AThermal_registerThermalHeadroomListener(mThermalManager, onHeadroomChange1, &data1)); + ASSERT_EQ(EINVAL, + AThermal_registerThermalHeadroomListener(mThermalManager, onHeadroomChange1, &data1)); + ASSERT_EQ(0, + AThermal_registerThermalHeadroomListener(mThermalManager, onHeadroomChange2, &data2)); + const ::std::vector<float> thresholds = {0.1f, 0.2f}; + capturedServiceListener->onHeadroomChange(0.1f, 0.3f, 20, thresholds); + ASSERT_TRUE(headroomCalled1.has_value()); + EXPECT_EQ(headroomCalled1->data, &data1); + EXPECT_EQ(headroomCalled1->headroom, 0.1f); + EXPECT_EQ(headroomCalled1->forecast, 0.3f); + EXPECT_EQ(headroomCalled1->forecastSeconds, 20); + EXPECT_EQ(headroomCalled1->thresholds, thresholds); + ASSERT_TRUE(headroomCalled2.has_value()); + EXPECT_EQ(headroomCalled2->data, &data2); + EXPECT_EQ(headroomCalled2->headroom, 0.1f); + EXPECT_EQ(headroomCalled2->forecast, 0.3f); + EXPECT_EQ(headroomCalled2->forecastSeconds, 20); + EXPECT_EQ(headroomCalled2->thresholds, thresholds); + + // after test finished the global service listener should be unregistered + EXPECT_CALL(*mMockIThermalService, unregisterThermalHeadroomListener(_, _)) + .Times(Exactly(1)) + .WillOnce(Return(binder::Status::ok())); +} + +TEST_F(NativeThermalUnitTest, TestUnregisterThermalHeadroomListener) { + sp<IThermalHeadroomListener> capturedServiceListener; + EXPECT_CALL(*mMockIThermalService, registerThermalHeadroomListener(_, _)) + .Times(Exactly(1)) + .WillOnce(DoAll(testing::SaveArg<0>(&capturedServiceListener), + testing::Invoke([](const sp<IThermalHeadroomListener>&, + bool* aidl_return) { *aidl_return = true; }), + Return(Status::ok()))); + float data1 = 1.0f; + float data2 = 2.0f; + ASSERT_EQ(0, + AThermal_registerThermalHeadroomListener(mThermalManager, onHeadroomChange1, &data1)); + ASSERT_EQ(0, + AThermal_registerThermalHeadroomListener(mThermalManager, onHeadroomChange2, &data2)); + capturedServiceListener->onHeadroomChange(0.1f, 0.3f, 20, {}); + ASSERT_TRUE(headroomCalled1.has_value()); + ASSERT_TRUE(headroomCalled2.has_value()); + + EXPECT_CALL(*mMockIThermalService, unregisterThermalHeadroomListener(_, _)) + .Times(Exactly(1)) + .WillRepeatedly(Return( + Status::fromExceptionCode(binder::Status::Exception::EX_TRANSACTION_FAILED))); + + // callback 1 should be unregistered and callback 2 unregistration should fail due to service + // listener unregistration call failure + ASSERT_EQ(0, + AThermal_unregisterThermalHeadroomListener(mThermalManager, onHeadroomChange1, + &data1)); + ASSERT_EQ(EPIPE, + AThermal_unregisterThermalHeadroomListener(mThermalManager, onHeadroomChange2, + &data2)); + // verify only callback 2 is called after callback 1 is unregistered + std::vector<float> thresholds = {0.1f, 0.2f}; + headroomCalled1.reset(); + headroomCalled2.reset(); + capturedServiceListener->onHeadroomChange(0.1f, 0.3f, 20, thresholds); + ASSERT_TRUE(!headroomCalled1.has_value()); + ASSERT_TRUE(headroomCalled2.has_value()); + + // verify only 1 service call to unregister global service listener + Mock::VerifyAndClearExpectations(mMockIThermalService); + EXPECT_CALL(*mMockIThermalService, unregisterThermalHeadroomListener(_, _)) + .Times(Exactly(1)) + .WillOnce(DoAll(testing::Invoke([](const sp<IThermalHeadroomListener>&, + bool* aidl_return) { *aidl_return = true; }), + Return(Status::ok()))); + ASSERT_EQ(EINVAL, + AThermal_unregisterThermalHeadroomListener(mThermalManager, onHeadroomChange1, + &data1)); + ASSERT_EQ(0, + AThermal_unregisterThermalHeadroomListener(mThermalManager, onHeadroomChange2, + &data2)); + // verify neither callback is called after global service listener is unregistered + headroomCalled1.reset(); + headroomCalled2.reset(); + capturedServiceListener->onHeadroomChange(0.1f, 0.3f, 20, thresholds); + ASSERT_TRUE(!headroomCalled1.has_value()); + ASSERT_TRUE(!headroomCalled2.has_value()); + + // verify adding a new callback will still work + Mock::VerifyAndClearExpectations(mMockIThermalService); + EXPECT_CALL(*mMockIThermalService, registerThermalHeadroomListener(_, _)) + .Times(Exactly(1)) + .WillOnce(DoAll(testing::SaveArg<0>(&capturedServiceListener), + testing::Invoke([](const sp<IThermalHeadroomListener>&, + bool* aidl_return) { *aidl_return = true; }), + Return(Status::ok()))); + ASSERT_EQ(0, + AThermal_registerThermalHeadroomListener(mThermalManager, onHeadroomChange1, &data1)); + headroomCalled1.reset(); + capturedServiceListener->onHeadroomChange(0.1f, 0.3f, 20, thresholds); + ASSERT_TRUE(headroomCalled1.has_value()); + EXPECT_EQ(headroomCalled1->data, &data1); + EXPECT_EQ(headroomCalled1->headroom, 0.1f); + EXPECT_EQ(headroomCalled1->forecast, 0.3f); + EXPECT_EQ(headroomCalled1->forecastSeconds, 20); + EXPECT_EQ(headroomCalled1->thresholds, thresholds); + + // after test finished the global service listener should be unregistered + EXPECT_CALL(*mMockIThermalService, unregisterThermalHeadroomListener(_, _)) + .Times(Exactly(1)) + .WillOnce(Return(binder::Status::ok())); +} + +TEST_F(NativeThermalUnitTest, TestRegisterThermalStatusListener) { + EXPECT_CALL(*mMockIThermalService, registerThermalStatusListener(_, _)) + .Times(Exactly(2)) + .WillOnce(Return( + Status::fromExceptionCode(binder::Status::Exception::EX_TRANSACTION_FAILED))); + int data1 = 1; + int data2 = 2; + ASSERT_EQ(EPIPE, + AThermal_registerThermalStatusListener(mThermalManager, onStatusChange1, &data1)); + ASSERT_EQ(EPIPE, + AThermal_registerThermalStatusListener(mThermalManager, onStatusChange2, &data2)); + + // verify only 1 service call to register a global listener + sp<IThermalStatusListener> capturedServiceListener; + Mock::VerifyAndClearExpectations(mMockIThermalService); + EXPECT_CALL(*mMockIThermalService, registerThermalStatusListener(_, _)) + .Times(Exactly(1)) + .WillOnce(DoAll(testing::SaveArg<0>(&capturedServiceListener), + testing::Invoke([](const sp<IThermalStatusListener>&, + bool* aidl_return) { *aidl_return = true; }), + Return(Status::ok()))); + ASSERT_EQ(0, AThermal_registerThermalStatusListener(mThermalManager, onStatusChange1, &data1)); + ASSERT_EQ(EINVAL, + AThermal_registerThermalStatusListener(mThermalManager, onStatusChange1, &data1)); + ASSERT_EQ(0, AThermal_registerThermalStatusListener(mThermalManager, onStatusChange2, &data2)); + + capturedServiceListener->onStatusChange(AThermalStatus::ATHERMAL_STATUS_LIGHT); + ASSERT_TRUE(statusCalled1.has_value()); + EXPECT_EQ(statusCalled1->data, &data1); + EXPECT_EQ(statusCalled1->status, AThermalStatus::ATHERMAL_STATUS_LIGHT); + ASSERT_TRUE(statusCalled2.has_value()); + EXPECT_EQ(statusCalled2->data, &data2); + EXPECT_EQ(statusCalled2->status, AThermalStatus::ATHERMAL_STATUS_LIGHT); + + // after test finished the callback should be unregistered + EXPECT_CALL(*mMockIThermalService, unregisterThermalStatusListener(_, _)) + .Times(Exactly(1)) + .WillOnce(Return(binder::Status::ok())); +} + +TEST_F(NativeThermalUnitTest, TestUnregisterThermalStatusListener) { + sp<IThermalStatusListener> capturedServiceListener; + EXPECT_CALL(*mMockIThermalService, registerThermalStatusListener(_, _)) + .Times(Exactly(1)) + .WillOnce(DoAll(testing::SaveArg<0>(&capturedServiceListener), + testing::Invoke([](const sp<IThermalStatusListener>&, + bool* aidl_return) { *aidl_return = true; }), + Return(Status::ok()))); + int data1 = 1; + int data2 = 2; + ASSERT_EQ(0, AThermal_registerThermalStatusListener(mThermalManager, onStatusChange1, &data1)); + ASSERT_EQ(0, AThermal_registerThermalStatusListener(mThermalManager, onStatusChange2, &data2)); + capturedServiceListener->onStatusChange(AThermalStatus::ATHERMAL_STATUS_LIGHT); + ASSERT_TRUE(statusCalled1.has_value()); + ASSERT_TRUE(statusCalled2.has_value()); + + EXPECT_CALL(*mMockIThermalService, unregisterThermalStatusListener(_, _)) + .Times(Exactly(1)) + .WillOnce(Return( + Status::fromExceptionCode(binder::Status::Exception::EX_TRANSACTION_FAILED))); + // callback 1 should be unregistered and callback 2 unregistration should fail due to service + // listener unregistration call failure + ASSERT_EQ(0, + AThermal_unregisterThermalStatusListener(mThermalManager, onStatusChange1, &data1)); + ASSERT_EQ(EPIPE, + AThermal_unregisterThermalStatusListener(mThermalManager, onStatusChange2, &data2)); + + // verify only callback 2 is called after callback 1 is unregistered + statusCalled1.reset(); + statusCalled2.reset(); + capturedServiceListener->onStatusChange(AThermalStatus::ATHERMAL_STATUS_LIGHT); + ASSERT_TRUE(!statusCalled1.has_value()); + ASSERT_TRUE(statusCalled2.has_value()); + + // verify only 1 service call to unregister global service listener + Mock::VerifyAndClearExpectations(mMockIThermalService); + EXPECT_CALL(*mMockIThermalService, unregisterThermalStatusListener(_, _)) + .Times(Exactly(1)) + .WillOnce(DoAll(testing::Invoke([](const sp<IThermalStatusListener>&, + bool* aidl_return) { *aidl_return = true; }), + Return(Status::ok()))); + ASSERT_EQ(EINVAL, + AThermal_unregisterThermalStatusListener(mThermalManager, onStatusChange1, &data1)); + ASSERT_EQ(0, + AThermal_unregisterThermalStatusListener(mThermalManager, onStatusChange2, &data2)); + // verify neither callback is called after global service listener is unregistered + statusCalled1.reset(); + statusCalled2.reset(); + capturedServiceListener->onStatusChange(AThermalStatus::ATHERMAL_STATUS_LIGHT); + ASSERT_TRUE(!statusCalled1.has_value()); + ASSERT_TRUE(!statusCalled2.has_value()); + + // verify adding a new callback will still work + Mock::VerifyAndClearExpectations(mMockIThermalService); + EXPECT_CALL(*mMockIThermalService, registerThermalStatusListener(_, _)) + .Times(Exactly(1)) + .WillOnce(DoAll(testing::SaveArg<0>(&capturedServiceListener), + testing::Invoke([](const sp<IThermalStatusListener>&, + bool* aidl_return) { *aidl_return = true; }), + Return(Status::ok()))); + ASSERT_EQ(0, AThermal_registerThermalStatusListener(mThermalManager, onStatusChange1, &data1)); + statusCalled1.reset(); + capturedServiceListener->onStatusChange(AThermalStatus::ATHERMAL_STATUS_LIGHT); + ASSERT_TRUE(statusCalled1.has_value()); + EXPECT_EQ(statusCalled1->data, &data1); + EXPECT_EQ(statusCalled1->status, AThermalStatus::ATHERMAL_STATUS_LIGHT); + + // after test finished the global service listener should be unregistered + EXPECT_CALL(*mMockIThermalService, unregisterThermalStatusListener(_, _)) + .Times(Exactly(1)) + .WillOnce(Return(binder::Status::ok())); +} diff --git a/native/android/thermal.cpp b/native/android/thermal.cpp index f7a3537d3f4a..cefcaf7766bb 100644 --- a/native/android/thermal.cpp +++ b/native/android/thermal.cpp @@ -17,6 +17,7 @@ #define LOG_TAG "thermal" #include <android-base/thread_annotations.h> +#include <android/os/BnThermalHeadroomListener.h> #include <android/os/BnThermalStatusListener.h> #include <android/os/IThermalService.h> #include <android/thermal.h> @@ -33,10 +34,10 @@ using android::sp; using namespace android; using namespace android::os; -struct ThermalServiceListener : public BnThermalStatusListener { +struct ThermalServiceStatusListener : public BnThermalStatusListener { public: virtual binder::Status onStatusChange(int32_t status) override; - ThermalServiceListener(AThermalManager *manager) { + ThermalServiceStatusListener(AThermalManager *manager) { mMgr = manager; } @@ -44,11 +45,29 @@ private: AThermalManager *mMgr; }; -struct ListenerCallback { +struct ThermalServiceHeadroomListener : public BnThermalHeadroomListener { +public: + virtual binder::Status onHeadroomChange(float headroom, float forecastHeadroom, + int32_t forecastSeconds, + const ::std::vector<float> &thresholds) override; + ThermalServiceHeadroomListener(AThermalManager *manager) { + mMgr = manager; + } + +private: + AThermalManager *mMgr; +}; + +struct StatusListenerCallback { AThermal_StatusCallback callback; void* data; }; +struct HeadroomListenerCallback { + AThermal_HeadroomCallback callback; + void *data; +}; + static IThermalService *gIThermalServiceForTesting = nullptr; struct AThermalManager { @@ -57,30 +76,44 @@ public: AThermalManager() = delete; ~AThermalManager(); status_t notifyStateChange(int32_t status); + status_t notifyHeadroomChange(float headroom, float forecastHeadroom, int32_t forecastSeconds, + const ::std::vector<float> &thresholds); status_t getCurrentThermalStatus(int32_t *status); - status_t addListener(AThermal_StatusCallback, void *data); - status_t removeListener(AThermal_StatusCallback, void *data); + status_t addStatusListener(AThermal_StatusCallback, void *data); + status_t removeStatusListener(AThermal_StatusCallback, void *data); status_t getThermalHeadroom(int32_t forecastSeconds, float *result); status_t getThermalHeadroomThresholds(const AThermalHeadroomThreshold **, size_t *size); + status_t addHeadroomListener(AThermal_HeadroomCallback, void *data); + status_t removeHeadroomListener(AThermal_HeadroomCallback, void *data); private: AThermalManager(sp<IThermalService> service); sp<IThermalService> mThermalSvc; - std::mutex mListenerMutex; - sp<ThermalServiceListener> mServiceListener GUARDED_BY(mListenerMutex); - std::vector<ListenerCallback> mListeners GUARDED_BY(mListenerMutex); - std::mutex mThresholdsMutex; - const AThermalHeadroomThreshold *mThresholds = nullptr; // GUARDED_BY(mThresholdsMutex) - size_t mThresholdsCount GUARDED_BY(mThresholdsMutex); + std::mutex mStatusListenerMutex; + sp<ThermalServiceStatusListener> mServiceStatusListener GUARDED_BY(mStatusListenerMutex); + std::vector<StatusListenerCallback> mStatusListeners GUARDED_BY(mStatusListenerMutex); + + std::mutex mHeadroomListenerMutex; + sp<ThermalServiceHeadroomListener> mServiceHeadroomListener GUARDED_BY(mHeadroomListenerMutex); + std::vector<HeadroomListenerCallback> mHeadroomListeners GUARDED_BY(mHeadroomListenerMutex); }; -binder::Status ThermalServiceListener::onStatusChange(int32_t status) { +binder::Status ThermalServiceStatusListener::onStatusChange(int32_t status) { if (mMgr != nullptr) { mMgr->notifyStateChange(status); } return binder::Status::ok(); } +binder::Status ThermalServiceHeadroomListener::onHeadroomChange( + float headroom, float forecastHeadroom, int32_t forecastSeconds, + const ::std::vector<float> &thresholds) { + if (mMgr != nullptr) { + mMgr->notifyHeadroomChange(headroom, forecastHeadroom, forecastSeconds, thresholds); + } + return binder::Status::ok(); +} + AThermalManager* AThermalManager::createAThermalManager() { if (gIThermalServiceForTesting) { return new AThermalManager(gIThermalServiceForTesting); @@ -96,97 +129,183 @@ AThermalManager* AThermalManager::createAThermalManager() { } AThermalManager::AThermalManager(sp<IThermalService> service) - : mThermalSvc(std::move(service)), mServiceListener(nullptr) {} + : mThermalSvc(std::move(service)), + mServiceStatusListener(nullptr), + mServiceHeadroomListener(nullptr) {} AThermalManager::~AThermalManager() { { - std::scoped_lock<std::mutex> listenerLock(mListenerMutex); - mListeners.clear(); - if (mServiceListener != nullptr) { + std::scoped_lock<std::mutex> listenerLock(mStatusListenerMutex); + mStatusListeners.clear(); + if (mServiceStatusListener != nullptr) { bool success = false; - mThermalSvc->unregisterThermalStatusListener(mServiceListener, &success); - mServiceListener = nullptr; + mThermalSvc->unregisterThermalStatusListener(mServiceStatusListener, &success); + mServiceStatusListener = nullptr; + } + } + { + std::scoped_lock<std::mutex> headroomListenerLock(mHeadroomListenerMutex); + mHeadroomListeners.clear(); + if (mServiceHeadroomListener != nullptr) { + bool success = false; + mThermalSvc->unregisterThermalHeadroomListener(mServiceHeadroomListener, &success); + mServiceHeadroomListener = nullptr; } } - std::scoped_lock<std::mutex> lock(mThresholdsMutex); - delete[] mThresholds; } status_t AThermalManager::notifyStateChange(int32_t status) { - std::scoped_lock<std::mutex> lock(mListenerMutex); + std::scoped_lock<std::mutex> lock(mStatusListenerMutex); AThermalStatus thermalStatus = static_cast<AThermalStatus>(status); - for (auto listener : mListeners) { + for (auto listener : mStatusListeners) { listener.callback(listener.data, thermalStatus); } return OK; } -status_t AThermalManager::addListener(AThermal_StatusCallback callback, void *data) { - std::scoped_lock<std::mutex> lock(mListenerMutex); +status_t AThermalManager::notifyHeadroomChange(float headroom, float forecastHeadroom, + int32_t forecastSeconds, + const ::std::vector<float> &thresholds) { + std::scoped_lock<std::mutex> lock(mHeadroomListenerMutex); + size_t thresholdsCount = thresholds.size(); + auto t = new AThermalHeadroomThreshold[thresholdsCount]; + for (int i = 0; i < (int)thresholdsCount; i++) { + t[i].headroom = thresholds[i]; + t[i].thermalStatus = static_cast<AThermalStatus>(i); + } + for (auto listener : mHeadroomListeners) { + listener.callback(listener.data, headroom, forecastHeadroom, forecastSeconds, t, + thresholdsCount); + } + delete[] t; + return OK; +} + +status_t AThermalManager::addStatusListener(AThermal_StatusCallback callback, void *data) { + std::scoped_lock<std::mutex> lock(mStatusListenerMutex); if (callback == nullptr) { // Callback can not be nullptr return EINVAL; } - for (const auto& cb : mListeners) { + for (const auto &cb : mStatusListeners) { // Don't re-add callbacks. if (callback == cb.callback && data == cb.data) { return EINVAL; } } - mListeners.emplace_back(ListenerCallback{callback, data}); - if (mServiceListener != nullptr) { + if (mServiceStatusListener != nullptr) { + mStatusListeners.emplace_back(StatusListenerCallback{callback, data}); return OK; } bool success = false; - mServiceListener = new ThermalServiceListener(this); - if (mServiceListener == nullptr) { + mServiceStatusListener = new ThermalServiceStatusListener(this); + if (mServiceStatusListener == nullptr) { return ENOMEM; } - auto ret = mThermalSvc->registerThermalStatusListener(mServiceListener, &success); + auto ret = mThermalSvc->registerThermalStatusListener(mServiceStatusListener, &success); if (!success || !ret.isOk()) { + mServiceStatusListener = nullptr; ALOGE("Failed in registerThermalStatusListener %d", success); if (ret.exceptionCode() == binder::Status::EX_SECURITY) { return EPERM; } return EPIPE; } + mStatusListeners.emplace_back(StatusListenerCallback{callback, data}); return OK; } -status_t AThermalManager::removeListener(AThermal_StatusCallback callback, void *data) { - std::scoped_lock<std::mutex> lock(mListenerMutex); +status_t AThermalManager::removeStatusListener(AThermal_StatusCallback callback, void *data) { + std::scoped_lock<std::mutex> lock(mStatusListenerMutex); - auto it = std::remove_if(mListeners.begin(), - mListeners.end(), - [&](const ListenerCallback& cb) { - return callback == cb.callback && - data == cb.data; + auto it = std::remove_if(mStatusListeners.begin(), mStatusListeners.end(), + [&](const StatusListenerCallback &cb) { + return callback == cb.callback && data == cb.data; }); - if (it == mListeners.end()) { + if (it == mStatusListeners.end()) { // If the listener and data pointer were not previously added. return EINVAL; } - mListeners.erase(it, mListeners.end()); + if (mServiceStatusListener == nullptr || mStatusListeners.size() > 1) { + mStatusListeners.erase(it, mStatusListeners.end()); + return OK; + } - if (!mListeners.empty()) { + bool success = false; + auto ret = mThermalSvc->unregisterThermalStatusListener(mServiceStatusListener, &success); + if (!success || !ret.isOk()) { + ALOGE("Failed in unregisterThermalStatusListener %d", success); + if (ret.exceptionCode() == binder::Status::EX_SECURITY) { + return EPERM; + } + return EPIPE; + } + mServiceStatusListener = nullptr; + mStatusListeners.erase(it, mStatusListeners.end()); + return OK; +} + +status_t AThermalManager::addHeadroomListener(AThermal_HeadroomCallback callback, void *data) { + std::scoped_lock<std::mutex> lock(mHeadroomListenerMutex); + if (callback == nullptr) { + return EINVAL; + } + for (const auto &cb : mHeadroomListeners) { + if (callback == cb.callback && data == cb.data) { + return EINVAL; + } + } + + if (mServiceHeadroomListener != nullptr) { + mHeadroomListeners.emplace_back(HeadroomListenerCallback{callback, data}); return OK; } - if (mServiceListener == nullptr) { + bool success = false; + mServiceHeadroomListener = new ThermalServiceHeadroomListener(this); + if (mServiceHeadroomListener == nullptr) { + return ENOMEM; + } + auto ret = mThermalSvc->registerThermalHeadroomListener(mServiceHeadroomListener, &success); + if (!success || !ret.isOk()) { + ALOGE("Failed in registerThermalHeadroomListener %d", success); + mServiceHeadroomListener = nullptr; + if (ret.exceptionCode() == binder::Status::EX_SECURITY) { + return EPERM; + } + return EPIPE; + } + mHeadroomListeners.emplace_back(HeadroomListenerCallback{callback, data}); + return OK; +} + +status_t AThermalManager::removeHeadroomListener(AThermal_HeadroomCallback callback, void *data) { + std::scoped_lock<std::mutex> lock(mHeadroomListenerMutex); + + auto it = std::remove_if(mHeadroomListeners.begin(), mHeadroomListeners.end(), + [&](const HeadroomListenerCallback &cb) { + return callback == cb.callback && data == cb.data; + }); + if (it == mHeadroomListeners.end()) { + return EINVAL; + } + if (mServiceHeadroomListener == nullptr || mHeadroomListeners.size() > 1) { + mHeadroomListeners.erase(it, mHeadroomListeners.end()); return OK; } bool success = false; - auto ret = mThermalSvc->unregisterThermalStatusListener(mServiceListener, &success); + auto ret = mThermalSvc->unregisterThermalHeadroomListener(mServiceHeadroomListener, &success); if (!success || !ret.isOk()) { - ALOGE("Failed in unregisterThermalStatusListener %d", success); + ALOGE("Failed in unregisterThermalHeadroomListener %d", success); if (ret.exceptionCode() == binder::Status::EX_SECURITY) { return EPERM; } return EPIPE; } - mServiceListener = nullptr; + mServiceHeadroomListener = nullptr; + mHeadroomListeners.erase(it, mHeadroomListeners.end()); return OK; } @@ -216,61 +335,36 @@ status_t AThermalManager::getThermalHeadroom(int32_t forecastSeconds, float *res status_t AThermalManager::getThermalHeadroomThresholds(const AThermalHeadroomThreshold **result, size_t *size) { - std::scoped_lock<std::mutex> lock(mThresholdsMutex); - if (mThresholds == nullptr) { - auto thresholds = std::make_unique<std::vector<float>>(); - binder::Status ret = mThermalSvc->getThermalHeadroomThresholds(thresholds.get()); - if (!ret.isOk()) { - if (ret.exceptionCode() == binder::Status::EX_UNSUPPORTED_OPERATION) { - // feature is not enabled - return ENOSYS; - } - return EPIPE; - } - mThresholdsCount = thresholds->size(); - auto t = new AThermalHeadroomThreshold[mThresholdsCount]; - for (int i = 0; i < (int)mThresholdsCount; i++) { - t[i].headroom = (*thresholds)[i]; - t[i].thermalStatus = static_cast<AThermalStatus>(i); + auto thresholds = std::make_unique<std::vector<float>>(); + binder::Status ret = mThermalSvc->getThermalHeadroomThresholds(thresholds.get()); + if (!ret.isOk()) { + if (ret.exceptionCode() == binder::Status::EX_UNSUPPORTED_OPERATION) { + // feature is not enabled + return ENOSYS; } - mThresholds = t; + return EPIPE; + } + size_t thresholdsCount = thresholds->size(); + auto t = new AThermalHeadroomThreshold[thresholdsCount]; + for (int i = 0; i < (int)thresholdsCount; i++) { + t[i].headroom = (*thresholds)[i]; + t[i].thermalStatus = static_cast<AThermalStatus>(i); } - *size = mThresholdsCount; - *result = mThresholds; + *size = thresholdsCount; + *result = t; return OK; } -/** - * Acquire an instance of the thermal manager. This must be freed using - * {@link AThermal_releaseManager}. - * - * @return manager instance on success, nullptr on failure. - */ AThermalManager* AThermal_acquireManager() { auto manager = AThermalManager::createAThermalManager(); return manager; } -/** - * Release the thermal manager pointer acquired by - * {@link AThermal_acquireManager}. - * - * @param manager The manager to be released. - * - */ void AThermal_releaseManager(AThermalManager *manager) { delete manager; } -/** - * Gets the current thermal status. - * - * @param manager The manager instance to use to query the thermal status, - * acquired by {@link AThermal_acquireManager}. - * - * @return current thermal status, ATHERMAL_STATUS_ERROR on failure. -*/ AThermalStatus AThermal_getCurrentThermalStatus(AThermalManager *manager) { int32_t status = 0; status_t ret = manager->getCurrentThermalStatus(&status); @@ -280,59 +374,16 @@ AThermalStatus AThermal_getCurrentThermalStatus(AThermalManager *manager) { return static_cast<AThermalStatus>(status); } -/** - * Register the thermal status listener for thermal status change. - * - * @param manager The manager instance to use to register. - * acquired by {@link AThermal_acquireManager}. - * @param callback The callback function to be called when thermal status updated. - * @param data The data pointer to be passed when callback is called. - * - * @return 0 on success - * EINVAL if the listener and data pointer were previously added and not removed. - * EPERM if the required permission is not held. - * EPIPE if communication with the system service has failed. - */ int AThermal_registerThermalStatusListener(AThermalManager *manager, - AThermal_StatusCallback callback, void *data) { - return manager->addListener(callback, data); + AThermal_StatusCallback callback, void *data) { + return manager->addStatusListener(callback, data); } -/** - * Unregister the thermal status listener previously resgistered. - * - * @param manager The manager instance to use to unregister. - * acquired by {@link AThermal_acquireManager}. - * @param callback The callback function to be called when thermal status updated. - * @param data The data pointer to be passed when callback is called. - * - * @return 0 on success - * EINVAL if the listener and data pointer were not previously added. - * EPERM if the required permission is not held. - * EPIPE if communication with the system service has failed. - */ int AThermal_unregisterThermalStatusListener(AThermalManager *manager, - AThermal_StatusCallback callback, void *data) { - return manager->removeListener(callback, data); + AThermal_StatusCallback callback, void *data) { + return manager->removeStatusListener(callback, data); } -/** - * Provides an estimate of how much thermal headroom the device currently has - * before hitting severe throttling. - * - * Note that this only attempts to track the headroom of slow-moving sensors, - * such as the skin temperature sensor. This means that there is no benefit to - * calling this function more frequently than about once per second, and attempts - * to call significantly more frequently may result in the function returning {@code NaN}. - * - * See also PowerManager#getThermalHeadroom. - * - * @param manager The manager instance to use - * @param forecastSeconds how many seconds in the future to forecast - * @return a value greater than or equal to 0.0 where 1.0 indicates the SEVERE throttling - * threshold. Returns NaN if the device does not support this functionality or if - * this function is called significantly faster than once per second. - */ float AThermal_getThermalHeadroom(AThermalManager *manager, int forecastSeconds) { float result = 0.0f; status_t ret = manager->getThermalHeadroom(forecastSeconds, &result); @@ -354,3 +405,13 @@ int AThermal_getThermalHeadroomThresholds(AThermalManager *manager, void AThermal_setIThermalServiceForTesting(void *iThermalService) { gIThermalServiceForTesting = static_cast<IThermalService *>(iThermalService); } + +int AThermal_registerThermalHeadroomListener(AThermalManager *manager, + AThermal_HeadroomCallback callback, void *data) { + return manager->addHeadroomListener(callback, data); +} + +int AThermal_unregisterThermalHeadroomListener(AThermalManager *manager, + AThermal_HeadroomCallback callback, void *data) { + return manager->removeHeadroomListener(callback, data); +} diff --git a/nfc/api/system-current.txt b/nfc/api/system-current.txt index 3ed9b7667be7..e97b15d3b926 100644 --- a/nfc/api/system-current.txt +++ b/nfc/api/system-current.txt @@ -124,6 +124,7 @@ package android.nfc { @FlaggedApi("android.nfc.nfc_oem_extension") public abstract class NfcRoutingTableEntry { method public int getNfceeId(); + method public int getRouteType(); method public int getType(); field public static final int TYPE_AID = 0; // 0x0 field public static final int TYPE_PROTOCOL = 1; // 0x1 diff --git a/nfc/java/android/nfc/Entry.java b/nfc/java/android/nfc/Entry.java index 49d0f10dbfce..aa5ba58e7179 100644 --- a/nfc/java/android/nfc/Entry.java +++ b/nfc/java/android/nfc/Entry.java @@ -25,11 +25,13 @@ public final class Entry implements Parcelable { private final byte mType; private final byte mNfceeId; private final String mEntry; + private final String mRoutingType; - public Entry(String entry, byte type, byte nfceeId) { + public Entry(String entry, byte type, byte nfceeId, String routingType) { mEntry = entry; mType = type; mNfceeId = nfceeId; + mRoutingType = routingType; } public byte getType() { @@ -44,6 +46,10 @@ public final class Entry implements Parcelable { return mEntry; } + public String getRoutingType() { + return mRoutingType; + } + @Override public int describeContents() { return 0; @@ -53,6 +59,7 @@ public final class Entry implements Parcelable { this.mEntry = in.readString(); this.mNfceeId = in.readByte(); this.mType = in.readByte(); + this.mRoutingType = in.readString(); } public static final @NonNull Parcelable.Creator<Entry> CREATOR = @@ -73,5 +80,6 @@ public final class Entry implements Parcelable { dest.writeString(mEntry); dest.writeByte(mNfceeId); dest.writeByte(mType); + dest.writeString(mRoutingType); } } diff --git a/nfc/java/android/nfc/NfcOemExtension.java b/nfc/java/android/nfc/NfcOemExtension.java index f78161e7cad0..fb11875ec7d7 100644 --- a/nfc/java/android/nfc/NfcOemExtension.java +++ b/nfc/java/android/nfc/NfcOemExtension.java @@ -887,18 +887,22 @@ public final class NfcOemExtension { switch (entry.getType()) { case TYPE_TECHNOLOGY -> result.add( new RoutingTableTechnologyEntry(entry.getNfceeId(), - RoutingTableTechnologyEntry.techStringToInt(entry.getEntry())) + RoutingTableTechnologyEntry.techStringToInt(entry.getEntry()), + routeStringToInt(entry.getRoutingType())) ); case TYPE_PROTOCOL -> result.add( new RoutingTableProtocolEntry(entry.getNfceeId(), - RoutingTableProtocolEntry.protocolStringToInt(entry.getEntry())) + RoutingTableProtocolEntry.protocolStringToInt(entry.getEntry()), + routeStringToInt(entry.getRoutingType())) ); case TYPE_AID -> result.add( - new RoutingTableAidEntry(entry.getNfceeId(), entry.getEntry()) + new RoutingTableAidEntry(entry.getNfceeId(), entry.getEntry(), + routeStringToInt(entry.getRoutingType())) ); case TYPE_SYSTEMCODE -> result.add( new RoutingTableSystemCodeEntry(entry.getNfceeId(), - entry.getEntry().getBytes(StandardCharsets.UTF_8)) + entry.getEntry().getBytes(StandardCharsets.UTF_8), + routeStringToInt(entry.getRoutingType())) ); } } diff --git a/nfc/java/android/nfc/NfcRoutingTableEntry.java b/nfc/java/android/nfc/NfcRoutingTableEntry.java index c2cbbede9b75..4153779a8ba2 100644 --- a/nfc/java/android/nfc/NfcRoutingTableEntry.java +++ b/nfc/java/android/nfc/NfcRoutingTableEntry.java @@ -19,6 +19,7 @@ package android.nfc; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.SystemApi; +import android.nfc.cardemulation.CardEmulation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -35,6 +36,7 @@ import java.lang.annotation.RetentionPolicy; public abstract class NfcRoutingTableEntry { private final int mNfceeId; private final int mType; + private final int mRouteType; /** * AID routing table type. @@ -67,9 +69,11 @@ public abstract class NfcRoutingTableEntry { public @interface RoutingTableType {} /** @hide */ - protected NfcRoutingTableEntry(int nfceeId, @RoutingTableType int type) { + protected NfcRoutingTableEntry(int nfceeId, @RoutingTableType int type, + @CardEmulation.ProtocolAndTechnologyRoute int routeType) { mNfceeId = nfceeId; mType = type; + mRouteType = routeType; } /** @@ -88,4 +92,14 @@ public abstract class NfcRoutingTableEntry { public int getType() { return mType; } + + /** + * Get the route type of this entry. + * @return an integer defined in + * {@link android.nfc.cardemulation.CardEmulation.ProtocolAndTechnologyRoute} + */ + @CardEmulation.ProtocolAndTechnologyRoute + public int getRouteType() { + return mRouteType; + } } diff --git a/nfc/java/android/nfc/RoutingTableAidEntry.java b/nfc/java/android/nfc/RoutingTableAidEntry.java index bf697d662bd6..be94f9fc117c 100644 --- a/nfc/java/android/nfc/RoutingTableAidEntry.java +++ b/nfc/java/android/nfc/RoutingTableAidEntry.java @@ -18,6 +18,7 @@ package android.nfc; import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.nfc.cardemulation.CardEmulation; /** * Represents an Application ID (AID) entry in current routing table. @@ -29,8 +30,9 @@ public class RoutingTableAidEntry extends NfcRoutingTableEntry { private final String mValue; /** @hide */ - public RoutingTableAidEntry(int nfceeId, String value) { - super(nfceeId, TYPE_AID); + public RoutingTableAidEntry(int nfceeId, String value, + @CardEmulation.ProtocolAndTechnologyRoute int routeType) { + super(nfceeId, TYPE_AID, routeType); this.mValue = value; } diff --git a/nfc/java/android/nfc/RoutingTableProtocolEntry.java b/nfc/java/android/nfc/RoutingTableProtocolEntry.java index 536de4d7430e..a68d8c167865 100644 --- a/nfc/java/android/nfc/RoutingTableProtocolEntry.java +++ b/nfc/java/android/nfc/RoutingTableProtocolEntry.java @@ -18,6 +18,7 @@ package android.nfc; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.SystemApi; +import android.nfc.cardemulation.CardEmulation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -96,8 +97,9 @@ public class RoutingTableProtocolEntry extends NfcRoutingTableEntry { private final @ProtocolValue int mValue; /** @hide */ - public RoutingTableProtocolEntry(int nfceeId, @ProtocolValue int value) { - super(nfceeId, TYPE_PROTOCOL); + public RoutingTableProtocolEntry(int nfceeId, @ProtocolValue int value, + @CardEmulation.ProtocolAndTechnologyRoute int routeType) { + super(nfceeId, TYPE_PROTOCOL, routeType); this.mValue = value; } diff --git a/nfc/java/android/nfc/RoutingTableSystemCodeEntry.java b/nfc/java/android/nfc/RoutingTableSystemCodeEntry.java index f61892d31668..06cc0a5f26f1 100644 --- a/nfc/java/android/nfc/RoutingTableSystemCodeEntry.java +++ b/nfc/java/android/nfc/RoutingTableSystemCodeEntry.java @@ -18,6 +18,7 @@ package android.nfc; import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.SystemApi; +import android.nfc.cardemulation.CardEmulation; /** * Represents a system code entry in current routing table, where system codes are two-byte values @@ -31,8 +32,9 @@ public class RoutingTableSystemCodeEntry extends NfcRoutingTableEntry { private final byte[] mValue; /** @hide */ - public RoutingTableSystemCodeEntry(int nfceeId, byte[] value) { - super(nfceeId, TYPE_SYSTEM_CODE); + public RoutingTableSystemCodeEntry(int nfceeId, byte[] value, + @CardEmulation.ProtocolAndTechnologyRoute int routeType) { + super(nfceeId, TYPE_SYSTEM_CODE, routeType); this.mValue = value; } diff --git a/nfc/java/android/nfc/RoutingTableTechnologyEntry.java b/nfc/java/android/nfc/RoutingTableTechnologyEntry.java index 2dbc94232b0b..86239ce7a6b2 100644 --- a/nfc/java/android/nfc/RoutingTableTechnologyEntry.java +++ b/nfc/java/android/nfc/RoutingTableTechnologyEntry.java @@ -18,6 +18,7 @@ package android.nfc; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.SystemApi; +import android.nfc.cardemulation.CardEmulation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -77,8 +78,9 @@ public class RoutingTableTechnologyEntry extends NfcRoutingTableEntry { private final @TechnologyValue int mValue; /** @hide */ - public RoutingTableTechnologyEntry(int nfceeId, @TechnologyValue int value) { - super(nfceeId, TYPE_TECHNOLOGY); + public RoutingTableTechnologyEntry(int nfceeId, @TechnologyValue int value, + @CardEmulation.ProtocolAndTechnologyRoute int routeType) { + super(nfceeId, TYPE_TECHNOLOGY, routeType); this.mValue = value; } diff --git a/nfc/tests/src/android/nfc/NdefRecordTest.java b/nfc/tests/src/android/nfc/NdefRecordTest.java index 231e939b4fbe..044c67448329 100644 --- a/nfc/tests/src/android/nfc/NdefRecordTest.java +++ b/nfc/tests/src/android/nfc/NdefRecordTest.java @@ -24,6 +24,8 @@ import androidx.test.filters.SmallTest; import org.junit.Test; import org.junit.runner.RunWith; +import java.util.Locale; + @SmallTest @RunWith(AndroidJUnit4.class) public class NdefRecordTest { @@ -56,4 +58,20 @@ public class NdefRecordTest { assertThat(ndefRecord.getType()).isEqualTo(NdefRecord.RTD_URI); } + @Test + public void testCreateMime() { + NdefRecord ndefRecord = NdefRecord.createMime("text/plain", "example".getBytes()); + assertThat(ndefRecord).isNotNull(); + assertThat(ndefRecord.getTnf()).isEqualTo(NdefRecord.TNF_MIME_MEDIA); + } + + @Test + public void testCreateTextRecord() { + String languageCode = Locale.getDefault().getLanguage(); + NdefRecord ndefRecord = NdefRecord.createTextRecord(languageCode, "testdata"); + assertThat(ndefRecord).isNotNull(); + assertThat(ndefRecord.getTnf()).isEqualTo(NdefRecord.TNF_WELL_KNOWN); + assertThat(ndefRecord.getType()).isEqualTo(NdefRecord.RTD_TEXT); + } + } diff --git a/packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java b/packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java index 2ba93f15f7fc..80d17d459cc8 100644 --- a/packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java +++ b/packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java @@ -25,6 +25,7 @@ import static com.android.server.crashrecovery.CrashRecoveryUtils.dumpCrashRecov import static java.lang.annotation.RetentionPolicy.SOURCE; +import android.annotation.CallbackExecutor; import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; @@ -91,6 +92,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; /** @@ -336,20 +338,28 @@ public class PackageWatchdog { /** * Registers {@code observer} to listen for package failures. Add a new ObserverInternal for * this observer if it does not already exist. + * For executing mitigations observers will receive callback on the given executor. * * <p>Observers are expected to call this on boot. It does not specify any packages but * it will resume observing any packages requested from a previous boot. + * + * @param observer instance of {@link PackageHealthObserver} for observing package failures + * and boot loops. + * @param executor Executor for the thread on which observers would receive callbacks * @hide */ - public void registerHealthObserver(PackageHealthObserver observer) { + public void registerHealthObserver(@NonNull PackageHealthObserver observer, + @NonNull @CallbackExecutor Executor executor) { synchronized (sLock) { ObserverInternal internalObserver = mAllObservers.get(observer.getUniqueIdentifier()); if (internalObserver != null) { internalObserver.registeredObserver = observer; + internalObserver.observerExecutor = executor; } else { internalObserver = new ObserverInternal(observer.getUniqueIdentifier(), new ArrayList<>()); internalObserver.registeredObserver = observer; + internalObserver.observerExecutor = executor; mAllObservers.put(observer.getUniqueIdentifier(), internalObserver); syncState("added new observer"); } @@ -357,40 +367,54 @@ public class PackageWatchdog { } /** - * Starts observing the health of the {@code packages} for {@code observer} and notifies - * {@code observer} of any package failures within the monitoring duration. + * Starts observing the health of the {@code packages} for {@code observer}. + * Note: Observer needs to be registered with {@link #registerHealthObserver} before calling + * this API. * * <p>If monitoring a package supporting explicit health check, at the end of the monitoring * duration if {@link #onHealthCheckPassed} was never called, - * {@link PackageHealthObserver#onExecuteHealthCheckMitigation} will be called as if the package failed. + * {@link PackageHealthObserver#onExecuteHealthCheckMitigation} will be called as if the + * package failed. * * <p>If {@code observer} is already monitoring a package in {@code packageNames}, * the monitoring window of that package will be reset to {@code durationMs} and the health - * check state will be reset to a default depending on if the package is contained in - * {@link mPackagesWithExplicitHealthCheckEnabled}. + * check state will be reset to a default. + * + * <p>The {@code observer} must be registered with {@link #registerHealthObserver} before + * calling this method. * - * <p>If {@code packageNames} is empty, this will be a no-op. + * @param packageNames The list of packages to check. If this is empty, the call will be a + * no-op. * - * <p>If {@code durationMs} is less than 1, a default monitoring duration - * {@link #DEFAULT_OBSERVING_DURATION_MS} will be used. + * @param timeoutMs The timeout after which Explicit Health Checks would not run. If this is + * less than 1, a default monitoring duration 2 days will be used. + * + * @throws IllegalStateException if the observer was not previously registered * @hide */ - public void startObservingHealth(PackageHealthObserver observer, List<String> packageNames, - long durationMs) { + public void startExplicitHealthCheck(@NonNull PackageHealthObserver observer, + @NonNull List<String> packageNames, long timeoutMs) { + synchronized (sLock) { + if (!mAllObservers.containsKey(observer.getUniqueIdentifier())) { + Slog.wtf(TAG, "No observer found, need to register the observer: " + + observer.getUniqueIdentifier()); + throw new IllegalStateException("Observer not registered"); + } + } if (packageNames.isEmpty()) { Slog.wtf(TAG, "No packages to observe, " + observer.getUniqueIdentifier()); return; } - if (durationMs < 1) { - Slog.wtf(TAG, "Invalid duration " + durationMs + "ms for observer " + if (timeoutMs < 1) { + Slog.wtf(TAG, "Invalid duration " + timeoutMs + "ms for observer " + observer.getUniqueIdentifier() + ". Not observing packages " + packageNames); - durationMs = DEFAULT_OBSERVING_DURATION_MS; + timeoutMs = DEFAULT_OBSERVING_DURATION_MS; } List<MonitoredPackage> packages = new ArrayList<>(); for (int i = 0; i < packageNames.size(); i++) { // Health checks not available yet so health check state will start INACTIVE - MonitoredPackage pkg = newMonitoredPackage(packageNames.get(i), durationMs, false); + MonitoredPackage pkg = newMonitoredPackage(packageNames.get(i), timeoutMs, false); if (pkg != null) { packages.add(pkg); } else { @@ -423,9 +447,6 @@ public class PackageWatchdog { } } - // Register observer in case not already registered - registerHealthObserver(observer); - // Sync after we add the new packages to the observers. We may have received packges // requiring an earlier schedule than we are currently scheduled for. syncState("updated observers"); @@ -485,7 +506,7 @@ public class PackageWatchdog { for (int pIndex = 0; pIndex < packages.size(); pIndex++) { VersionedPackage versionedPackage = packages.get(pIndex); // Observer that will receive failure for versionedPackage - PackageHealthObserver currentObserverToNotify = null; + ObserverInternal currentObserverToNotify = null; int currentObserverImpact = Integer.MAX_VALUE; MonitoredPackage currentMonitoredPackage = null; @@ -506,7 +527,7 @@ public class PackageWatchdog { versionedPackage, failureReason, mitigationCount); if (impact != PackageHealthObserverImpact.USER_IMPACT_LEVEL_0 && impact < currentObserverImpact) { - currentObserverToNotify = registeredObserver; + currentObserverToNotify = observer; currentObserverImpact = impact; currentMonitoredPackage = p; } @@ -515,18 +536,23 @@ public class PackageWatchdog { // Execute action with least user impact if (currentObserverToNotify != null) { - int mitigationCount = 1; + int mitigationCount; if (currentMonitoredPackage != null) { currentMonitoredPackage.noteMitigationCallLocked(); mitigationCount = currentMonitoredPackage.getMitigationCountLocked(); + } else { + mitigationCount = 1; } if (Flags.recoverabilityDetection()) { maybeExecute(currentObserverToNotify, versionedPackage, failureReason, currentObserverImpact, mitigationCount); } else { - currentObserverToNotify.onExecuteHealthCheckMitigation( - versionedPackage, failureReason, mitigationCount); + PackageHealthObserver registeredObserver = + currentObserverToNotify.registeredObserver; + currentObserverToNotify.observerExecutor.execute(() -> + registeredObserver.onExecuteHealthCheckMitigation( + versionedPackage, failureReason, mitigationCount)); } } } @@ -539,10 +565,11 @@ public class PackageWatchdog { * For native crashes or explicit health check failures, call directly into each observer to * mitigate the error without going through failure threshold logic. */ + @GuardedBy("sLock") private void handleFailureImmediately(List<VersionedPackage> packages, @FailureReasons int failureReason) { VersionedPackage failingPackage = packages.size() > 0 ? packages.get(0) : null; - PackageHealthObserver currentObserverToNotify = null; + ObserverInternal currentObserverToNotify = null; int currentObserverImpact = Integer.MAX_VALUE; for (ObserverInternal observer: mAllObservers.values()) { PackageHealthObserver registeredObserver = observer.registeredObserver; @@ -551,7 +578,7 @@ public class PackageWatchdog { failingPackage, failureReason, 1); if (impact != PackageHealthObserverImpact.USER_IMPACT_LEVEL_0 && impact < currentObserverImpact) { - currentObserverToNotify = registeredObserver; + currentObserverToNotify = observer; currentObserverImpact = impact; } } @@ -561,23 +588,30 @@ public class PackageWatchdog { maybeExecute(currentObserverToNotify, failingPackage, failureReason, currentObserverImpact, /*mitigationCount=*/ 1); } else { - currentObserverToNotify.onExecuteHealthCheckMitigation(failingPackage, - failureReason, 1); + PackageHealthObserver registeredObserver = + currentObserverToNotify.registeredObserver; + currentObserverToNotify.observerExecutor.execute(() -> + registeredObserver.onExecuteHealthCheckMitigation(failingPackage, + failureReason, 1)); + } } } - private void maybeExecute(PackageHealthObserver currentObserverToNotify, + private void maybeExecute(ObserverInternal currentObserverToNotify, VersionedPackage versionedPackage, @FailureReasons int failureReason, int currentObserverImpact, int mitigationCount) { if (allowMitigations(currentObserverImpact, versionedPackage)) { + PackageHealthObserver registeredObserver; synchronized (sLock) { mLastMitigation = mSystemClock.uptimeMillis(); + registeredObserver = currentObserverToNotify.registeredObserver; } - currentObserverToNotify.onExecuteHealthCheckMitigation(versionedPackage, failureReason, - mitigationCount); + currentObserverToNotify.observerExecutor.execute(() -> + registeredObserver.onExecuteHealthCheckMitigation(versionedPackage, + failureReason, mitigationCount)); } } @@ -613,8 +647,7 @@ public class PackageWatchdog { mBootThreshold.reset(); } int mitigationCount = mBootThreshold.getMitigationCount() + 1; - PackageHealthObserver currentObserverToNotify = null; - ObserverInternal currentObserverInternal = null; + ObserverInternal currentObserverToNotify = null; int currentObserverImpact = Integer.MAX_VALUE; for (int i = 0; i < mAllObservers.size(); i++) { final ObserverInternal observer = mAllObservers.valueAt(i); @@ -626,25 +659,31 @@ public class PackageWatchdog { : registeredObserver.onBootLoop(mitigationCount); if (impact != PackageHealthObserverImpact.USER_IMPACT_LEVEL_0 && impact < currentObserverImpact) { - currentObserverToNotify = registeredObserver; - currentObserverInternal = observer; + currentObserverToNotify = observer; currentObserverImpact = impact; } } } + if (currentObserverToNotify != null) { + PackageHealthObserver registeredObserver = + currentObserverToNotify.registeredObserver; if (Flags.recoverabilityDetection()) { int currentObserverMitigationCount = - currentObserverInternal.getBootMitigationCount() + 1; - currentObserverInternal.setBootMitigationCount( + currentObserverToNotify.getBootMitigationCount() + 1; + currentObserverToNotify.setBootMitigationCount( currentObserverMitigationCount); saveAllObserversBootMitigationCountToMetadata(METADATA_FILE); - currentObserverToNotify.onExecuteBootLoopMitigation( - currentObserverMitigationCount); + currentObserverToNotify.observerExecutor + .execute(() -> registeredObserver.onExecuteBootLoopMitigation( + currentObserverMitigationCount)); } else { mBootThreshold.setMitigationCount(mitigationCount); mBootThreshold.saveMitigationCountToMetadata(); - currentObserverToNotify.onExecuteBootLoopMitigation(mitigationCount); + currentObserverToNotify.observerExecutor + .execute(() -> registeredObserver.onExecuteBootLoopMitigation( + mitigationCount)); + } } } @@ -879,7 +918,7 @@ public class PackageWatchdog { * passed to observers in these API. * * <p> A persistent observer may choose to start observing certain failing packages, even if - * it has not explicitly asked to watch the package with {@link #startObservingHealth}. + * it has not explicitly asked to watch the package with {@link #startExplicitHealthCheck}. */ default boolean mayObservePackage(@NonNull String packageName) { return false; @@ -1136,8 +1175,10 @@ public class PackageWatchdog { if (versionedPkg != null) { Slog.i(TAG, "Explicit health check failed for package " + versionedPkg); - registeredObserver.onExecuteHealthCheckMitigation(versionedPkg, - PackageWatchdog.FAILURE_REASON_EXPLICIT_HEALTH_CHECK, 1); + observer.observerExecutor.execute(() -> + registeredObserver.onExecuteHealthCheckMitigation(versionedPkg, + PackageWatchdog.FAILURE_REASON_EXPLICIT_HEALTH_CHECK, + 1)); } } } @@ -1395,6 +1436,7 @@ public class PackageWatchdog { @Nullable @GuardedBy("sLock") public PackageHealthObserver registeredObserver; + public Executor observerExecutor; private int mMitigationCount; ObserverInternal(String name, List<MonitoredPackage> packages) { diff --git a/packages/CrashRecovery/services/module/java/com/android/server/RescueParty.java b/packages/CrashRecovery/services/module/java/com/android/server/RescueParty.java index 992f581a8a70..bad6ab7c1dd4 100644 --- a/packages/CrashRecovery/services/module/java/com/android/server/RescueParty.java +++ b/packages/CrashRecovery/services/module/java/com/android/server/RescueParty.java @@ -160,7 +160,7 @@ public class RescueParty { /** Register the Rescue Party observer as a Package Watchdog health observer */ public static void registerHealthObserver(Context context) { PackageWatchdog.getInstance(context).registerHealthObserver( - RescuePartyObserver.getInstance(context)); + RescuePartyObserver.getInstance(context), context.getMainExecutor()); } private static boolean isDisabled() { @@ -313,7 +313,7 @@ public class RescueParty { callingPackageList.addAll(callingPackages); Slog.i(TAG, "Starting to observe: " + callingPackageList + ", updated namespace: " + updatedNamespace); - PackageWatchdog.getInstance(context).startObservingHealth( + PackageWatchdog.getInstance(context).startExplicitHealthCheck( rescuePartyObserver, callingPackageList, DEFAULT_OBSERVING_DURATION_MS); diff --git a/packages/CrashRecovery/services/module/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/packages/CrashRecovery/services/module/java/com/android/server/rollback/RollbackPackageHealthObserver.java index 311def80f248..e1e5866e7b04 100644 --- a/packages/CrashRecovery/services/module/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/packages/CrashRecovery/services/module/java/com/android/server/rollback/RollbackPackageHealthObserver.java @@ -111,7 +111,8 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve dataDir.mkdirs(); mLastStagedRollbackIdsFile = new File(dataDir, "last-staged-rollback-ids"); mTwoPhaseRollbackEnabledFile = new File(dataDir, "two-phase-rollback-enabled"); - PackageWatchdog.getInstance(mContext).registerHealthObserver(this); + PackageWatchdog.getInstance(mContext).registerHealthObserver(this, + context.getMainExecutor()); if (SystemProperties.getBoolean("sys.boot_completed", false)) { // Load the value from the file if system server has crashed and restarted @@ -280,7 +281,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve @AnyThread @NonNull public void startObservingHealth(@NonNull List<String> packages, @NonNull long durationMs) { - PackageWatchdog.getInstance(mContext).startObservingHealth(this, packages, durationMs); + PackageWatchdog.getInstance(mContext).startExplicitHealthCheck(this, packages, durationMs); } @AnyThread diff --git a/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java b/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java index 88fe36cda395..4fea9372971d 100644 --- a/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java +++ b/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java @@ -87,6 +87,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; /** @@ -362,7 +363,7 @@ public class PackageWatchdog { * it will resume observing any packages requested from a previous boot. * @hide */ - public void registerHealthObserver(PackageHealthObserver observer) { + public void registerHealthObserver(PackageHealthObserver observer, Executor ignoredExecutor) { synchronized (mLock) { ObserverInternal internalObserver = mAllObservers.get(observer.getUniqueIdentifier()); if (internalObserver != null) { @@ -396,7 +397,7 @@ public class PackageWatchdog { * {@link #DEFAULT_OBSERVING_DURATION_MS} will be used. * @hide */ - public void startObservingHealth(PackageHealthObserver observer, List<String> packageNames, + public void startExplicitHealthCheck(PackageHealthObserver observer, List<String> packageNames, long durationMs) { if (packageNames.isEmpty()) { Slog.wtf(TAG, "No packages to observe, " + observer.getUniqueIdentifier()); @@ -445,7 +446,7 @@ public class PackageWatchdog { } // Register observer in case not already registered - registerHealthObserver(observer); + registerHealthObserver(observer, null); // Sync after we add the new packages to the observers. We may have received packges // requiring an earlier schedule than we are currently scheduled for. @@ -861,7 +862,7 @@ public class PackageWatchdog { * otherwise * * <p> A persistent observer may choose to start observing certain failing packages, even if - * it has not explicitly asked to watch the package with {@link #startObservingHealth}. + * it has not explicitly asked to watch the package with {@link #startExplicitHealthCheck}. */ default boolean mayObservePackage(@NonNull String packageName) { return false; diff --git a/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java b/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java index f757236613d1..2bb72fb43dff 100644 --- a/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java +++ b/packages/CrashRecovery/services/platform/java/com/android/server/RescueParty.java @@ -166,7 +166,7 @@ public class RescueParty { /** Register the Rescue Party observer as a Package Watchdog health observer */ public static void registerHealthObserver(Context context) { PackageWatchdog.getInstance(context).registerHealthObserver( - RescuePartyObserver.getInstance(context)); + RescuePartyObserver.getInstance(context), null); } private static boolean isDisabled() { @@ -387,7 +387,7 @@ public class RescueParty { callingPackageList.addAll(callingPackages); Slog.i(TAG, "Starting to observe: " + callingPackageList + ", updated namespace: " + updatedNamespace); - PackageWatchdog.getInstance(context).startObservingHealth( + PackageWatchdog.getInstance(context).startExplicitHealthCheck( rescuePartyObserver, callingPackageList, DEFAULT_OBSERVING_DURATION_MS); diff --git a/packages/CrashRecovery/services/platform/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/packages/CrashRecovery/services/platform/java/com/android/server/rollback/RollbackPackageHealthObserver.java index 7445534e95bf..0692cdbc5e40 100644 --- a/packages/CrashRecovery/services/platform/java/com/android/server/rollback/RollbackPackageHealthObserver.java +++ b/packages/CrashRecovery/services/platform/java/com/android/server/rollback/RollbackPackageHealthObserver.java @@ -110,7 +110,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve dataDir.mkdirs(); mLastStagedRollbackIdsFile = new File(dataDir, "last-staged-rollback-ids"); mTwoPhaseRollbackEnabledFile = new File(dataDir, "two-phase-rollback-enabled"); - PackageWatchdog.getInstance(mContext).registerHealthObserver(this); + PackageWatchdog.getInstance(mContext).registerHealthObserver(this, null); mApexManager = apexManager; if (SystemProperties.getBoolean("sys.boot_completed", false)) { @@ -284,7 +284,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve @AnyThread @NonNull public void startObservingHealth(@NonNull List<String> packages, @NonNull long durationMs) { - PackageWatchdog.getInstance(mContext).startObservingHealth(this, packages, durationMs); + PackageWatchdog.getInstance(mContext).startExplicitHealthCheck(this, packages, durationMs); } @AnyThread diff --git a/packages/CredentialManager/res/values-hy/strings.xml b/packages/CredentialManager/res/values-hy/strings.xml index 630a08a7e903..799712710196 100644 --- a/packages/CredentialManager/res/values-hy/strings.xml +++ b/packages/CredentialManager/res/values-hy/strings.xml @@ -22,7 +22,7 @@ <string name="string_continue" msgid="1346732695941131882">"Շարունակել"</string> <string name="string_more_options" msgid="2763852250269945472">"Պահել մեկ այլ եղանակ"</string> <string name="string_learn_more" msgid="4541600451688392447">"Իմանալ ավելին"</string> - <string name="content_description_show_password" msgid="3283502010388521607">"Ցուցադրել գաղտնաբառը"</string> + <string name="content_description_show_password" msgid="3283502010388521607">"Ցույց տալ գաղտնաբառը"</string> <string name="content_description_hide_password" msgid="6841375971631767996">"Թաքցնել գաղտնաբառը"</string> <string name="passkey_creation_intro_title" msgid="4251037543787718844">"Մուտքի բանալիների հետ ավելի ապահով է"</string> <string name="passkey_creation_intro_body_password" msgid="8825872426579958200">"Մուտքի բանալիների շնորհիվ դուք բարդ գաղտնաբառեր ստեղծելու կամ հիշելու անհրաժեշտություն չեք ունենա"</string> diff --git a/packages/LocalTransport/src/com/android/localtransport/LocalTransport.java b/packages/LocalTransport/src/com/android/localtransport/LocalTransport.java index 6a4bb216b495..a3b06e8c71fc 100644 --- a/packages/LocalTransport/src/com/android/localtransport/LocalTransport.java +++ b/packages/LocalTransport/src/com/android/localtransport/LocalTransport.java @@ -16,8 +16,10 @@ package com.android.localtransport; +import android.annotation.NonNull; import android.annotation.Nullable; import android.app.backup.BackupAgent; +import android.app.backup.BackupAnnotations; import android.app.backup.BackupDataInput; import android.app.backup.BackupDataOutput; import android.app.backup.BackupManagerMonitor; @@ -52,6 +54,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.List; /** * Backup transport for stashing stuff into a known location on disk, and @@ -939,4 +942,15 @@ public class LocalTransport extends BackupTransport { } } } + + @NonNull + @Override + public List<String> getPackagesThatShouldNotUseRestrictedMode( + @NonNull List<String> packageNames, + @BackupAnnotations.OperationType int operationType) { + if (DEBUG) { + Log.d(TAG, "No restricted mode packages: " + mParameters.noRestrictedModePackages()); + } + return mParameters.noRestrictedModePackages(); + } } diff --git a/packages/LocalTransport/src/com/android/localtransport/LocalTransportParameters.java b/packages/LocalTransport/src/com/android/localtransport/LocalTransportParameters.java index aaa18bf755bc..c980913f80c6 100644 --- a/packages/LocalTransport/src/com/android/localtransport/LocalTransportParameters.java +++ b/packages/LocalTransport/src/com/android/localtransport/LocalTransportParameters.java @@ -16,26 +16,33 @@ package com.android.localtransport; -import android.util.KeyValueSettingObserver; import android.content.ContentResolver; import android.os.Handler; import android.provider.Settings; import android.util.KeyValueListParser; +import android.util.KeyValueSettingObserver; + +import java.util.Arrays; +import java.util.List; public class LocalTransportParameters extends KeyValueSettingObserver { - private static final String TAG = "LocalTransportParams"; private static final String SETTING = Settings.Secure.BACKUP_LOCAL_TRANSPORT_PARAMETERS; private static final String KEY_FAKE_ENCRYPTION_FLAG = "fake_encryption_flag"; private static final String KEY_NON_INCREMENTAL_ONLY = "non_incremental_only"; private static final String KEY_IS_DEVICE_TRANSFER = "is_device_transfer"; private static final String KEY_IS_ENCRYPTED = "is_encrypted"; private static final String KEY_LOG_AGENT_RESULTS = "log_agent_results"; + // This needs to be a list of package names separated by semicolons. For example: + // "com.package1;com.package2;com.package3". We can't use commas because the base class uses + // commas to split Key/Value pairs. + private static final String KEY_NO_RESTRICTED_MODE_PACKAGES = "no_restricted_mode_packages"; private boolean mFakeEncryptionFlag; private boolean mIsNonIncrementalOnly; private boolean mIsDeviceTransfer; private boolean mIsEncrypted; private boolean mLogAgentResults; + private String mNoRestrictedModePackages; public LocalTransportParameters(Handler handler, ContentResolver resolver) { super(handler, resolver, Settings.Secure.getUriFor(SETTING)); @@ -61,6 +68,13 @@ public class LocalTransportParameters extends KeyValueSettingObserver { return mLogAgentResults; } + List<String> noRestrictedModePackages() { + if (mNoRestrictedModePackages == null) { + return List.of(); + } + return Arrays.stream(mNoRestrictedModePackages.split(";")).toList(); + } + public String getSettingValue(ContentResolver resolver) { return Settings.Secure.getString(resolver, SETTING); } @@ -71,5 +85,6 @@ public class LocalTransportParameters extends KeyValueSettingObserver { mIsDeviceTransfer = parser.getBoolean(KEY_IS_DEVICE_TRANSFER, false); mIsEncrypted = parser.getBoolean(KEY_IS_ENCRYPTED, false); mLogAgentResults = parser.getBoolean(KEY_LOG_AGENT_RESULTS, /* def */ false); + mNoRestrictedModePackages = parser.getString(KEY_NO_RESTRICTED_MODE_PACKAGES, /* def */ ""); } } diff --git a/packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyedObserver.kt b/packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyedObserver.kt index cd03dd7ca1b3..07b1c9e3385e 100644 --- a/packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyedObserver.kt +++ b/packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/KeyedObserver.kt @@ -22,6 +22,7 @@ import androidx.collection.MutableScatterMap import com.google.errorprone.annotations.CanIgnoreReturnValue import java.util.WeakHashMap import java.util.concurrent.Executor +import java.util.concurrent.atomic.AtomicInteger /** * Callback to be informed of changes in [KeyedObservable] object. @@ -203,13 +204,71 @@ open class KeyedDataObservable<K> : KeyedObservable<K> { } } - fun hasAnyObserver(): Boolean { + open fun hasAnyObserver(): Boolean { synchronized(observers) { if (observers.isNotEmpty()) return true } synchronized(keyedObservers) { if (keyedObservers.isNotEmpty()) return true } return false } } +/** [KeyedDataObservable] that maintains a counter for the observers. */ +abstract class AbstractKeyedDataObservable<K> : KeyedDataObservable<K>() { + /** + * Counter of observers. + * + * The value is accurate only when [addObserver] and [removeObserver] are invoked in pairs. + */ + private val counter = AtomicInteger() + + override fun addObserver(observer: KeyedObserver<K?>, executor: Executor) = + if (super.addObserver(observer, executor)) { + onObserverAdded() + true + } else { + false + } + + override fun addObserver(key: K, observer: KeyedObserver<K>, executor: Executor) = + if (super.addObserver(key, observer, executor)) { + onObserverAdded() + true + } else { + false + } + + private fun onObserverAdded() { + if (counter.getAndIncrement() == 0) onFirstObserverAdded() + } + + /** Callbacks when the first observer is just added. */ + protected abstract fun onFirstObserverAdded() + + override fun removeObserver(observer: KeyedObserver<K?>) = + if (super.removeObserver(observer)) { + onObserverRemoved() + true + } else { + false + } + + override fun removeObserver(key: K, observer: KeyedObserver<K>) = + if (super.removeObserver(key, observer)) { + onObserverRemoved() + true + } else { + false + } + + private fun onObserverRemoved() { + if (counter.decrementAndGet() == 0) onLastObserverRemoved() + } + + /** Callbacks when the last observer is just removed. */ + protected abstract fun onLastObserverRemoved() + + override fun hasAnyObserver() = counter.get() > 0 +} + /** [KeyedObservable] with no-op implementations for all interfaces. */ open class NoOpKeyedObservable<K> : KeyedObservable<K> { diff --git a/packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsStore.kt b/packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsStore.kt index 04d4bfe0741d..d6e7a896eb63 100644 --- a/packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsStore.kt +++ b/packages/SettingsLib/DataStore/src/com/android/settingslib/datastore/SettingsStore.kt @@ -20,21 +20,10 @@ import android.content.ContentResolver import android.database.ContentObserver import android.net.Uri import android.util.Log -import java.util.concurrent.Executor -import java.util.concurrent.atomic.AtomicInteger /** Base class of the Settings provider data stores. */ abstract class SettingsStore(protected val contentResolver: ContentResolver) : - KeyedDataObservable<String>(), KeyValueStore { - - /** - * Counter of observers. - * - * The value is accurate only when [addObserver] and [removeObserver] are called correctly. When - * an observer is not removed (and its weak reference is garbage collected), the content - * observer is not unregistered but this is not a big deal. - */ - private val counter = AtomicInteger() + AbstractKeyedDataObservable<String>(), KeyValueStore { private val contentObserver = object : ContentObserver(HandlerExecutor.main) { @@ -48,49 +37,15 @@ abstract class SettingsStore(protected val contentResolver: ContentResolver) : } } - override fun addObserver(observer: KeyedObserver<String?>, executor: Executor) = - if (super.addObserver(observer, executor)) { - onObserverAdded() - true - } else { - false - } - - override fun addObserver(key: String, observer: KeyedObserver<String>, executor: Executor) = - if (super.addObserver(key, observer, executor)) { - onObserverAdded() - true - } else { - false - } + /** The URI to watch for any key change. */ + protected abstract val uri: Uri - private fun onObserverAdded() { - if (counter.getAndIncrement() != 0) return + override fun onFirstObserverAdded() { Log.i(tag, "registerContentObserver") contentResolver.registerContentObserver(uri, true, contentObserver) } - /** The URI to watch for any key change. */ - protected abstract val uri: Uri - - override fun removeObserver(observer: KeyedObserver<String?>) = - if (super.removeObserver(observer)) { - onObserverRemoved() - true - } else { - false - } - - override fun removeObserver(key: String, observer: KeyedObserver<String>) = - if (super.removeObserver(key, observer)) { - onObserverRemoved() - true - } else { - false - } - - private fun onObserverRemoved() { - if (counter.decrementAndGet() != 0) return + override fun onLastObserverRemoved() { Log.i(tag, "unregisterContentObserver") contentResolver.unregisterContentObserver(contentObserver) } diff --git a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt index 7436ac1f9712..6704ecc93891 100644 --- a/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt +++ b/packages/SettingsLib/Metadata/src/com/android/settingslib/metadata/PreferenceStateProviders.kt @@ -20,6 +20,8 @@ import android.content.Context import android.content.ContextWrapper import android.content.Intent import android.os.Bundle +import androidx.lifecycle.LifecycleCoroutineScope +import kotlinx.coroutines.CoroutineScope /** * Interface to provide dynamic preference title. @@ -138,6 +140,13 @@ interface PreferenceLifecycleProvider { */ abstract class PreferenceLifecycleContext(context: Context) : ContextWrapper(context) { + /** + * [CoroutineScope] tied to the lifecycle, which is cancelled when the lifecycle is destroyed. + * + * @see [androidx.lifecycle.lifecycleScope] + */ + abstract val lifecycleScope: LifecycleCoroutineScope + /** Returns the preference widget object associated with given key. */ abstract fun <T> findPreference(key: String): T? diff --git a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt index 03b225efc3cc..6fc9357e9332 100644 --- a/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt +++ b/packages/SettingsLib/Preference/src/com/android/settingslib/preference/PreferenceScreenBindingHelper.kt @@ -19,6 +19,8 @@ package com.android.settingslib.preference import android.content.Context import android.content.Intent import android.os.Bundle +import androidx.lifecycle.LifecycleCoroutineScope +import androidx.lifecycle.lifecycleScope import androidx.preference.Preference import androidx.preference.PreferenceDataStore import androidx.preference.PreferenceGroup @@ -57,6 +59,9 @@ class PreferenceScreenBindingHelper( private val preferenceLifecycleContext = object : PreferenceLifecycleContext(context) { + override val lifecycleScope: LifecycleCoroutineScope + get() = fragment.lifecycleScope + override fun <T> findPreference(key: String) = preferenceScreen.findPreference(key) as T? diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-af/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-af/strings.xml index 4bd1d451ce8f..b41ec957f12d 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-af/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-af/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Geaktiveer deur administrateur"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Gedeaktiveer deur administrateur"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Geaktiveer deur Gevorderde Beskerming"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Gedeaktiveer deur Gevorderde Beskerming"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-am/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-am/strings.xml index ef380fd343dd..8e9488453032 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-am/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-am/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"በአስተዳዳሪ ነቅቷል"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"በአስተዳዳሪ ተሰናክሏል"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"በላቀ ጥበቃ የነቃ"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"በላቀ ጥበቃ የተሰናከለ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ar/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ar/strings.xml index 57cf30f1c3c7..8b2ccdfbb0e8 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ar/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ar/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"يفعِّل المشرف هذا الإعداد."</string> <string name="disabled_by_admin" msgid="4023569940620832713">"أوقف المشرف هذا الإعداد"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"تم التفعيل من خلال ميزة \"الحماية المتقدّمة\""</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"تم الإيقاف من خلال ميزة \"الحماية المتقدّمة\""</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-as/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-as/strings.xml index 21fe73ae59b3..03e9e828534a 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-as/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-as/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"প্ৰশাসকে সক্ষম কৰিছে"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"প্ৰশাসকে অক্ষম কৰিছে"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"সুৰক্ষা সম্পৰ্কীয় উন্নত সুবিধাটোৱে সক্ষম কৰিছে"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"সুৰক্ষা সম্পৰ্কীয় উন্নত সুবিধাটোৱে অক্ষম কৰিছে"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-az/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-az/strings.xml index c7c4c388aca0..98447166a156 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-az/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-az/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Admin tərəfindən aktiv edildi"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Admin tərəfindən deaktiv edildi"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Qabaqcıl Qoruma tərəfindən aktiv edilib"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Qabaqcıl Qoruma tərəfindən deaktiv edilib"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-b+sr+Latn/strings.xml index a7d139577967..c7b9be28fb1e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-b+sr+Latn/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Administrator je omogućio"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Administrator je onemogućio"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Omogućila je Napredna zaštita"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Onemogućila je Napredna zaštita"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-be/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-be/strings.xml index 60b9fc6c3cb0..92ed11157dfc 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-be/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-be/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Уключана адміністратарам"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Адключана адміністратарам"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Уключана Палепшанай абаронай"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Адключана Палепшанай абаронай"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-bg/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-bg/strings.xml index f98a8d43cff5..57b50c5c580c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-bg/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-bg/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Активирано от администратора"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Деактивирано от администратора"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Активирано от „Разширена защита“"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Деактивирано от „Разширена защита“"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-bn/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-bn/strings.xml index 87e8bd2969ba..939ceb82ab40 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-bn/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-bn/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"অ্যাডমিন চালু করেছেন"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"অ্যাডমিন বন্ধ করেছেন"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"উন্নত সুরক্ষা চালু করেছে"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"উন্নত সুরক্ষা বন্ধ করেছে"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-bs/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-bs/strings.xml index a56917f9d286..87cd3b8905c7 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-bs/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-bs/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Omogućio administrator"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Onemogućio administrator"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Omogućeno je Naprednom zaštitom"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Onemogućeno je Naprednom zaštitom"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ca/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ca/strings.xml index ac38bd1f439c..34099b6f3f08 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ca/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ca/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Activat per l\'administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Desactivat per l\'administrador"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Activat per la Protecció avançada"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Desactivat per la Protecció avançada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-cs/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-cs/strings.xml index 1840ecd3609b..82cd56f39059 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-cs/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-cs/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Zapnuto administrátorem"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Vypnuto administrátorem"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktivováno pokročilou ochranou"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Deaktivováno pokročilou ochranou"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-da/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-da/strings.xml index 2e6dd0f04bb8..7f7ae8b3d5e0 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-da/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-da/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aktiveret af administratoren"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Deaktiveret af administrator"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktiveret af Avanceret beskyttelse"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Deaktiveret af Avanceret beskyttelse"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-de/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-de/strings.xml index 88c146cc9e35..efaa50efacf4 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-de/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-de/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Vom Administrator aktiviert"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Vom Administrator deaktiviert"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Vom erweiterten Sicherheitsprogramm aktiviert"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Vom erweiterten Sicherheitsprogramm deaktiviert"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-el/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-el/strings.xml index 941d4ba5ebc2..ddde3ece472a 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-el/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-el/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Ενεργοποιήθηκε από τον διαχειριστή"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Απενεργοποιήθηκε από τον διαχειριστή"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Ενεργοποιήθηκε από την Ενισχυμένη προστασία"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Απενεργοποιήθηκε από την Ενισχυμένη προστασία"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rAU/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rAU/strings.xml index 91268ec2f896..6a07741d8e4c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rAU/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Enabled by admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Disabled by admin"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Enabled by Advanced Protection"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disabled by Advanced Protection"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rCA/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rCA/strings.xml index 91268ec2f896..6a07741d8e4c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rCA/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rCA/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Enabled by admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Disabled by admin"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Enabled by Advanced Protection"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disabled by Advanced Protection"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rGB/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rGB/strings.xml index 91268ec2f896..6a07741d8e4c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rGB/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Enabled by admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Disabled by admin"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Enabled by Advanced Protection"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disabled by Advanced Protection"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rIN/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rIN/strings.xml index 91268ec2f896..6a07741d8e4c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-en-rIN/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Enabled by admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Disabled by admin"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Enabled by Advanced Protection"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disabled by Advanced Protection"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-es-rUS/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-es-rUS/strings.xml index 9ea88df3ff62..8dc15f77f6e0 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-es-rUS/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-es-rUS/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"El administrador habilitó la opción"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"El administrador inhabilitó la opción"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Habilitado por la Protección avanzada"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Inhabilitado por la Protección avanzada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-es/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-es/strings.xml index 35777a231fff..7c9864d7e81e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-es/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-es/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Habilitado por el administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Inhabilitado por el administrador"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Habilitado por Protección Avanzada"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Inhabilitado por Protección Avanzada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-et/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-et/strings.xml index 806d4b88ff5c..5939b584a0f2 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-et/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-et/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Administraatori lubatud"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Administraatori keelatud"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Lubatud täiustatud kaitsega"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Keelatud täiustatud kaitsega"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-eu/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-eu/strings.xml index 4fe9b23eeaba..27bef6e92073 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-eu/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-eu/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Administratzaileak gaitu egin du"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Administratzaileak desgaitu du"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Babes aurreratua programak gaitu du"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Babes aurreratua programak desgaitu du"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-fa/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-fa/strings.xml index 774cb9f15e10..8fb2646821dc 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-fa/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-fa/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"توسط سرپرست فعال شده"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"توسط سرپرست غیرفعال شده"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"فعالشده با «محافظت پیشرفته»"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"غیرفعالشده با «محافظت پیشرفته»"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-fi/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-fi/strings.xml index c15882b3f650..cd7cbd3d83ca 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-fi/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-fi/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Järjestelmänvalvojan sallima"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Järjestelmänvalvojan estämä"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Lisäsuojaus on ottanut asetuksen käyttöön"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Lisäsuojaus on poistanut asetuksen käytöstä"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-fr-rCA/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-fr-rCA/strings.xml index 188e9cbf72a7..8f0d572aa193 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-fr-rCA/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Activé par l\'administrateur"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Désactivé par l\'administrateur"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Activé par la protection avancée"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Désactivé par la protection avancée"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-fr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-fr/strings.xml index 188e9cbf72a7..2215af24664c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-fr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-fr/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Activé par l\'administrateur"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Désactivé par l\'administrateur"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Activé par la Protection Avancée"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Désactivé par la Protection Avancée"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-gl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-gl/strings.xml index de603d05801a..92f33bbf2533 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-gl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-gl/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Opción activada polo administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Opción desactivada polo administrador"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Opción activada por Protección avanzada"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Opción desactivada por Protección avanzada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-gu/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-gu/strings.xml index 3ea8c49a1c08..026bdb1127d3 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-gu/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-gu/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"વ્યવસ્થાપકે ચાલુ કરેલ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ઍડમિને બંધ કરેલું"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"અદ્યતન સુરક્ષા દ્વારા ચાલુ કરવામાં આવી છે"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"અદ્યતન સુરક્ષા દ્વારા બંધ કરવામાં આવી છે"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-hi/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-hi/strings.xml index 93ac326e7361..8fc8fd04ad93 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-hi/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-hi/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"एडमिन की ओर से चालू किया गया"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"एडमिन ने यह सुविधा बंद की हुई है"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"\'ऐडवांस सुरक्षा\' सेटिंग ने चालू किया है"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"\'ऐडवांस सुरक्षा\' सेटिंग ने बंद किया है"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-hr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-hr/strings.xml index a56917f9d286..40605a3b83fb 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-hr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-hr/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Omogućio administrator"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Onemogućio administrator"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Omogućila je napredna zaštita"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Onemogućila je napredna zaštita"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-hu/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-hu/strings.xml index 897729d12fa8..59135a42fd2a 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-hu/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-hu/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"A rendszergazda bekapcsolta"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"A rendszergazda letiltotta"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Engedélyezte a Speciális védelem"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Letiltotta a Speciális védelem"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-hy/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-hy/strings.xml index 7c8e3492516f..0221f9333249 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-hy/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-hy/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Միացված է ադմինիստրատորի կողմից"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Անջատվել է ադմինիստրատորի կողմից"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Միացվել է Լրացուցիչ պաշտպանության կողմից"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Անջատվել է Լրացուցիչ պաշտպանության կողմից"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-in/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-in/strings.xml index 0b08fdbd9620..6beb4c9b2c26 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-in/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-in/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Diaktifkan oleh admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Dinonaktifkan oleh admin"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Diaktifkan oleh Perlindungan Lanjutan"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Dinonaktifkan oleh Perlindungan Lanjutan"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-is/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-is/strings.xml index 6a041c77def5..feb325bf2210 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-is/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-is/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Gert virkt af kerfisstjóra"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Gert óvirkt af kerfisstjóra"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Virkjað af ítarlegri vernd"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Gert óvirkt af ítarlegri vernd"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-it/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-it/strings.xml index ee78ae8f11de..616392026b55 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-it/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-it/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Attivata dall\'amministratore"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Opzione disattivata dall\'amministratore"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Attivata dalla protezione avanzata"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Disattivata dalla protezione avanzata"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-iw/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-iw/strings.xml index c24331841a1b..c342041f6c6e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-iw/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-iw/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"מופעל על ידי מנהל המכשיר"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"האפשרות הושבתה על ידי האדמין"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ההעדפה הופעלה על ידי ההגנה המתקדמת"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ההעדפה הושבתה על ידי ההגנה המתקדמת"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ja/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ja/strings.xml index e4aa5c9b1569..bd386f5858a9 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ja/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ja/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"管理者によって有効にされています"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"管理者により無効にされています"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"高度な保護機能により有効になっています"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"高度な保護機能により無効になっています"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ka/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ka/strings.xml index 86248f681efa..a6fde9022a21 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ka/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ka/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ჩართულია ადმინისტრატორის მიერ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"გათიშულია ადმინისტრატორის მიერ"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ჩართულია დამატებითი დაცვის საშუალებით"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"გათიშულია დამატებითი დაცვის საშუალებით"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-kk/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-kk/strings.xml index b945c07a5a56..ed0f95c200f6 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-kk/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-kk/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Әкімші қосқан"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Әкімші өшірген"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Күшейтілген қорғаныс параметрі қосып қойды."</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Күшейтілген қорғаныс параметрі өшіріп тастады."</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-km/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-km/strings.xml index 9deadfd996a0..f2f5ab8e1dbf 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-km/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-km/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"បើកដោយអ្នកគ្រប់គ្រង"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"បានបិទដោយអ្នកគ្រប់គ្រង"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"បានបើកដោយការការពារកម្រិតខ្ពស់"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"បានបិទដោយការការពារកម្រិតខ្ពស់"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-kn/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-kn/strings.xml index 2af7fe2aa327..ebc41a52b4df 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-kn/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-kn/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ನಿರ್ವಾಹಕರು ಸಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ಸುಧಾರಿತ ಸಂರಕ್ಷಣೆ ಮೂಲಕ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ಸುಧಾರಿತ ಸಂರಕ್ಷಣೆ ಮೂಲಕ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ko/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ko/strings.xml index 62b781f9a87b..552662b4be95 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ko/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ko/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"관리자가 사용 설정함"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"관리자가 사용 중지함"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"고급 보호 기능으로 사용 설정됨"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"고급 보호 기능으로 사용 중지됨"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ky/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ky/strings.xml index 8437e9e8b2c2..375ea19ff66e 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ky/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ky/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Администратор иштетип койгон"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Администратор өчүрүп койгон"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Өркүндөтүлгөн коргоо тарабынан иштетилди"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Өркүндөтүлгөн коргоо тарабынан өчүрүлдү"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-lo/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-lo/strings.xml index be21bf4bd03e..4b311c0ce38d 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-lo/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-lo/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ເປີດນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ຖືກຜູ້ເບິ່ງແຍງລະບົບປິດໄວ້"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ໄດ້ເປີດການນຳໃຊ້ໂດຍການປົກປ້ອງຂັ້ນສູງ"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ໄດ້ປິດການນຳໃຊ້ໂດຍການປົກປ້ອງຂັ້ນສູງ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-lt/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-lt/strings.xml index b290a54e0d57..cbbe92374854 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-lt/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-lt/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Įgalino administratorius"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Išjungė administratorius"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Įgalino Papildoma apsauga"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Išjungė Papildoma apsauga"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-lv/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-lv/strings.xml index 5f86f984e8be..a5189aa70ff8 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-lv/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-lv/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Iespējoja administrators"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Atspējoja administrators"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Iespējota iestatījuma “Papildu aizsardzība” dēļ"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Atspējota iestatījuma “Papildu aizsardzība” dēļ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-mk/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-mk/strings.xml index e3f0e75f39cd..993b4aea8b13 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-mk/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-mk/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Овозможено од администраторот"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Оневозможено од администраторот"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Овозможено од „Напредна заштита“"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Оневозможено од „Напредна заштита“"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ml/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ml/strings.xml index fe1a4ae0d1e2..9deeb6aa2cfd 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ml/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ml/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"അഡ്മിൻ പ്രവർത്തനക്ഷമമാക്കി"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കി"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"വിപുലമായ പരിരക്ഷ പ്രവർത്തനക്ഷമമാക്കി"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"വിപുലമായ പരിരക്ഷ പ്രവർത്തനരഹിതമാക്കി"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-mn/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-mn/strings.xml index c3799c36616b..c9a91de26591 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-mn/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-mn/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Админ идэвхжүүлсэн"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Админ цуцалсан"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Дэвшилтэт хамгаалалтаар идэвхжүүлсэн"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Дэвшилтэт хамгаалалтаар идэвхгүй болгосон"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-mr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-mr/strings.xml index 4e4660b376cb..ede12424de04 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-mr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-mr/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"अॅडमिनने सुरू केलेले"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"अॅडमिनने बंद केलेले"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"प्रगत संरक्षणाद्वारे सुरू केले आहे"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"प्रगत संरक्षणाद्वारे बंद केले आहे"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ms/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ms/strings.xml index 4bfcf2e59214..e8f710a7c909 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ms/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ms/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Didayakan oleh pentadbir"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Dilumpuhkan oleh pentadbir"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Didayakan oleh Perlindungan Lanjutan"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Dilumpuhkan oleh Perlindungan Lanjutan"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-my/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-my/strings.xml index ef9ab1a987f7..97be99f43291 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-my/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-my/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"စီမံခန့်ခွဲသူက ဖွင့်ထားသည်"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"စီမံခန့်ခွဲသူက ပိတ်ထားသည်"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"အဆင့်မြင့်ကာကွယ်ရေးက ဖွင့်ထားသည်"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"အဆင့်မြင့်ကာကွယ်ရေးက ပိတ်ထားသည်"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-nb/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-nb/strings.xml index 423d7ceb7f5c..971d1ccd190a 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-nb/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-nb/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aktivert av administratoren"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Deaktivert av administratoren"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktivert av Avansert beskyttelse"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Deaktivert av Avansert beskyttelse"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ne/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ne/strings.xml index 8793a81853df..3d2a74e3b270 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ne/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ne/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"प्रशासकद्वारा सक्षम पारिएको"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"एडमिनले अफ गरेको"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"सुरक्षासम्बन्धी उन्नत सुविधाले अन गरेको छ"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"सुरक्षासम्बन्धी उन्नत सुविधाले अफ गरेको छ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-nl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-nl/strings.xml index 60bb02178c24..9830363c7f65 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-nl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-nl/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aangezet door beheerder"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Uitgezet door beheerder"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aangezet door Geavanceerde beveiliging"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Uitgezet door Geavanceerde beveiliging"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-or/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-or/strings.xml index 92004fb20def..2dab1592c296 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-or/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-or/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ଆଡମିନଙ୍କ ଦ୍ୱାରା ସକ୍ଷମ କରାଯାଇଛି"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ଆଡମିନଙ୍କ ଦ୍ଵାରା ଅକ୍ଷମ କରାଯାଇଛି"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ଆଡଭାନ୍ସଡ ପ୍ରୋଟେକସନ ଦ୍ୱାରା ସକ୍ଷମ କରାଯାଇଛି"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ଆଡଭାନ୍ସଡ ପ୍ରୋଟେକସନ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pa/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pa/strings.xml index 144dd4ad276a..12f296a46b2d 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pa/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pa/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"ਅਡਵਾਂਸ ਸੁਰੱਖਿਆ ਵੱਲੋਂ ਚਾਲੂ ਕੀਤੀ ਗਈ"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ਅਡਵਾਂਸ ਸੁਰੱਖਿਆ ਵੱਲੋਂ ਬੰਦ ਕੀਤੀ ਗਈ"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pl/strings.xml index 13814e13be05..df7394766339 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pl/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Włączone przez administratora"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Wyłączone przez administratora"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Włączone przez Ochronę zaawansowaną"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Wyłączone przez Ochronę zaawansowaną"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rBR/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rBR/strings.xml index 8e97ffc4c0d6..a705ba421910 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rBR/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rBR/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Ativado pelo administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Desativado pelo administrador"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Preferência ativada pela Proteção Avançada"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Preferência desativada pela Proteção Avançada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rPT/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rPT/strings.xml index 8e97ffc4c0d6..b01118381478 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rPT/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pt-rPT/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Ativado pelo administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Desativado pelo administrador"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Ativado pela Proteção avançada"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Desativado pela Proteção avançada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-pt/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-pt/strings.xml index 8e97ffc4c0d6..a705ba421910 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-pt/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-pt/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Ativado pelo administrador"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Desativado pelo administrador"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Preferência ativada pela Proteção Avançada"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Preferência desativada pela Proteção Avançada"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ro/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ro/strings.xml index 6120ef6e4290..3eb347abbc1b 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ro/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ro/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Activat de administrator"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Dezactivat de administrator"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Activată de Protecția avansată"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Dezactivată de Protecția avansată"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ru/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ru/strings.xml index f06aa0641fd2..a004a1fe60da 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ru/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ru/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Включено администратором"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Отключено администратором"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Включено Дополнительной защитой"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Отключено Дополнительной защитой"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-si/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-si/strings.xml index c9a9e23f903e..addc8b3ae15c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-si/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-si/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"පරිපාලක විසින් සබල කර ඇත"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ඔබගේ පරිපාලක විසින් අබල කර ඇත"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"උසස් ආරක්ෂණය මගින් සබල කර ඇත"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"උසස් ආරක්ෂණය මගින් අබල කර ඇත"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sk/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sk/strings.xml index f6c1b6666983..0277696560b9 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sk/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sk/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Povolené správcom"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Zakázané správcom"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktivované rozšírenou ochranou"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Deaktivované rozšírenou ochranou"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sl/strings.xml index 029cdefec092..eb886bcf1232 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sl/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Omogočil skrbnik"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Onemogočil skrbnik"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Omogočila dodatna zaščita"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Onemogočila dodatna zaščita"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sq/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sq/strings.xml index 341d6bb29cc4..2de5ffe47c1c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sq/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sq/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aktivizuar nga administratori"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Çaktivizuar nga administratori"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktivizuar nga \"Mbrojtja e përparuar\""</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Çaktivizuar nga \"Mbrojtja e përparuar\""</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sr/strings.xml index a783a02f1733..94f52a0b95a2 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sr/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Администратор је омогућио"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Администратор је онемогућио"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Омогућила је Напредна заштита"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Онемогућила је Напредна заштита"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sv/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sv/strings.xml index c930d4745ca4..b41c4d8a8275 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sv/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sv/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Aktiverad av administratör"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Inaktiverad av administratören"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Aktiverades av Avancerat skydd"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Inaktiverades av Avancerat skydd"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-sw/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-sw/strings.xml index d61c8fbc962f..4d2e0d994972 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-sw/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-sw/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Imewashwa na msimamizi"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Imezimwa na msimamizi"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Imewashwa kwa kutumia Ulinzi wa Hali ya Juu"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Imezimwa kwa kutumia Ulinzi wa Hali ya Juu"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ta/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ta/strings.xml index b39f76ff55df..55b300657eaf 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ta/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ta/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"நிர்வாகி இயக்கியுள்ளார்"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"நிர்வாகி முடக்கியுள்ளார்"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"மேம்பட்ட பாதுகாப்பு அமைப்பால் இயக்கப்பட்டது"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"மேம்பட்ட பாதுகாப்பு அமைப்பால் முடக்கப்பட்டது"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-te/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-te/strings.xml index 4b8cd74e77c2..fc6d00b22d34 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-te/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-te/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"అడ్మిన్ ఎనేబుల్ చేశారు"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"అడ్మిన్ డిజేబుల్ చేశారు"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"అడ్వాన్స్డ్ ప్రొటెక్షన్ ద్వారా ఎనేబుల్ చేయబడింది"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"అడ్వాన్స్డ్ ప్రొటెక్షన్ ద్వారా డిజేబుల్ చేయబడింది"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-th/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-th/strings.xml index 414d3c1fb2b5..51da8dec6443 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-th/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-th/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"เปิดใช้โดยผู้ดูแลระบบ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"ปิดใช้โดยผู้ดูแลระบบ"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"เปิดใช้โดยการปกป้องขั้นสูง"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"ปิดใช้โดยการปกป้องขั้นสูง"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-tl/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-tl/strings.xml index 34a057d3724b..7fbf0e7ace73 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-tl/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-tl/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Na-enable ng admin"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Na-disable ng admin"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Na-enable ng Advanced na Proteksyon"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Na-disable ng Advanced na Proteksyon"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-tr/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-tr/strings.xml index f8d1f557f2dd..a529ca557ba1 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-tr/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-tr/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Yönetici tarafından etkinleştirildi"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Yönetici tarafından devre dışı bırakıldı"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Gelişmiş Koruma tarafından etkinleştirildi"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Gelişmiş Koruma tarafından devre dışı bırakıldı"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-uk/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-uk/strings.xml index 2fa4634440d3..fdf4160b1bb0 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-uk/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-uk/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Увімкнено адміністратором"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Вимкнено адміністратором"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Увімкнено Додатковим захистом"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Вимкнено Додатковим захистом"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-ur/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-ur/strings.xml index 940130951ab4..b40cb6827523 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-ur/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-ur/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"منتظم کی طرف سے فعال کردہ"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"منتظم کی طرف سے غیر فعال کردہ"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"اعلی تحفظ نے فعال کیا ہے"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"اعلی تحفظ نے غیر فعال کیا ہے"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-uz/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-uz/strings.xml index a726e6cec473..9a27735407e2 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-uz/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-uz/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Administrator tomonidan yoqilgan"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Administrator tomonidan faolsizlantirilgan"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Kuchaytirilgan himoya tomonidan yoqilgan"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Kuchaytirilgan himoya tomonidan faolsizlantirilgan"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-vi/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-vi/strings.xml index 63bb27ab8d9c..3436762f8355 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-vi/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-vi/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Do quản trị viên bật"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Quản trị viên đã vô hiệu hóa chế độ này"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Được bật bởi chế độ Bảo vệ nâng cao"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Bị tắt bởi chế độ Bảo vệ nâng cao"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rCN/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rCN/strings.xml index 5698cf3a81ec..5c9e302f274c 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rCN/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"已被管理员启用"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"已被管理员停用"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"已被“高级保护”功能启用"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"已被“高级保护”功能停用"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rHK/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rHK/strings.xml index f37ccd89364b..d4b883355cf3 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rHK/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"已由管理員啟用"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"已由管理員停用"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"已由進階保護功能啟用"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"已由進階保護功能停用"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rTW/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rTW/strings.xml index f37ccd89364b..d4b883355cf3 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-zh-rTW/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"已由管理員啟用"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"已由管理員停用"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"已由進階保護功能啟用"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"已由進階保護功能停用"</string> </resources> diff --git a/packages/SettingsLib/RestrictedLockUtils/res/values-zu/strings.xml b/packages/SettingsLib/RestrictedLockUtils/res/values-zu/strings.xml index 848992574c97..2a93d00d687f 100644 --- a/packages/SettingsLib/RestrictedLockUtils/res/values-zu/strings.xml +++ b/packages/SettingsLib/RestrictedLockUtils/res/values-zu/strings.xml @@ -19,8 +19,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="enabled_by_admin" msgid="6630472777476410137">"Kunikwe amandla umlawuli"</string> <string name="disabled_by_admin" msgid="4023569940620832713">"Kukhutshazwe umlawuli"</string> - <!-- no translation found for enabled_by_advanced_protection (6236917660829422499) --> - <skip /> - <!-- no translation found for disabled_by_advanced_protection (369596009193239632) --> - <skip /> + <string name="enabled_by_advanced_protection" msgid="6236917660829422499">"Kunikwe Amandla Ukuvikela Okuthuthukile"</string> + <string name="disabled_by_advanced_protection" msgid="369596009193239632">"Kukhutshazwe Ukuvikela Okuthuthukile"</string> </resources> diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt index d89d3977cac3..5a524d944a24 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/template/app/AppInfo.kt @@ -133,7 +133,7 @@ class AppInfoProvider(private val packageInfo: PackageInfo) { list.joinToString(separator = System.lineSeparator()) } if (footer.isBlank()) return - HorizontalDivider() + if (!isSpaExpressiveEnabled) HorizontalDivider() Column( modifier = if (isSpaExpressiveEnabled) Modifier.padding(SettingsDimension.footerItemPadding) diff --git a/packages/SettingsLib/aconfig/settingslib.aconfig b/packages/SettingsLib/aconfig/settingslib.aconfig index 2d13add1e15f..c1f254ad2b34 100644 --- a/packages/SettingsLib/aconfig/settingslib.aconfig +++ b/packages/SettingsLib/aconfig/settingslib.aconfig @@ -185,5 +185,5 @@ flag { name: "hearing_device_set_connection_status_report" namespace: "accessibility" description: "Enable the connection status report for a set of hearing device." - bug: "357878944" + bug: "357882387" } diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume.xml new file mode 100644 index 000000000000..2c1f300f22ee --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<level-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:maxLevel="0" android:drawable="@drawable/ic_ambient_volume_0_0" /> + <item android:maxLevel="1" android:drawable="@drawable/ic_ambient_volume_0_1" /> + <item android:maxLevel="2" android:drawable="@drawable/ic_ambient_volume_0_2" /> + <item android:maxLevel="3" android:drawable="@drawable/ic_ambient_volume_0_3" /> + <item android:maxLevel="4" android:drawable="@drawable/ic_ambient_volume_0_4" /> + <item android:maxLevel="5" android:drawable="@drawable/ic_ambient_volume_1_0" /> + <item android:maxLevel="6" android:drawable="@drawable/ic_ambient_volume_1_1" /> + <item android:maxLevel="7" android:drawable="@drawable/ic_ambient_volume_1_2" /> + <item android:maxLevel="8" android:drawable="@drawable/ic_ambient_volume_1_3" /> + <item android:maxLevel="9" android:drawable="@drawable/ic_ambient_volume_1_4" /> + <item android:maxLevel="10" android:drawable="@drawable/ic_ambient_volume_2_0" /> + <item android:maxLevel="11" android:drawable="@drawable/ic_ambient_volume_2_1" /> + <item android:maxLevel="12" android:drawable="@drawable/ic_ambient_volume_2_2" /> + <item android:maxLevel="13" android:drawable="@drawable/ic_ambient_volume_2_3" /> + <item android:maxLevel="14" android:drawable="@drawable/ic_ambient_volume_2_4" /> + <item android:maxLevel="15" android:drawable="@drawable/ic_ambient_volume_3_0" /> + <item android:maxLevel="16" android:drawable="@drawable/ic_ambient_volume_3_1" /> + <item android:maxLevel="17" android:drawable="@drawable/ic_ambient_volume_3_2" /> + <item android:maxLevel="18" android:drawable="@drawable/ic_ambient_volume_3_3" /> + <item android:maxLevel="19" android:drawable="@drawable/ic_ambient_volume_3_4" /> + <item android:maxLevel="20" android:drawable="@drawable/ic_ambient_volume_4_0" /> + <item android:maxLevel="21" android:drawable="@drawable/ic_ambient_volume_4_1" /> + <item android:maxLevel="22" android:drawable="@drawable/ic_ambient_volume_4_2" /> + <item android:maxLevel="23" android:drawable="@drawable/ic_ambient_volume_4_3" /> + <item android:maxLevel="24" android:drawable="@drawable/ic_ambient_volume_4_4" /> +</level-list>
\ No newline at end of file diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_0_0.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_0.xml new file mode 100644 index 000000000000..738fe89636c9 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_0.xml @@ -0,0 +1,25 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960"> + <path + android:fillColor="@android:color/white" + android:pathData="M792,904L671,783Q646,799 618,810.5Q590,822 560,829L560,747Q574,742 587.5,737Q601,732 613,725L480,592L480,800L280,600L120,600L120,360L248,360L56,168L112,112L848,848L792,904ZM784,672L726,614Q743,583 751.5,549Q760,515 760,479Q760,385 705,311Q650,237 560,211L560,129Q684,157 762,254.5Q840,352 840,479Q840,532 825.5,581Q811,630 784,672ZM650,538L560,448L560,318Q607,340 633.5,384Q660,428 660,480Q660,495 657.5,509.5Q655,524 650,538ZM480,368L376,264L480,160L480,368ZM400,606L400,512L328,440L328,440L200,440L200,520L314,520L400,606ZM364,476L364,476L364,476L364,476L364,476L364,476L364,476Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_0_1.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_1.xml new file mode 100644 index 000000000000..8de24f980927 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_1.xml @@ -0,0 +1,27 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_0_2.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_2.xml new file mode 100644 index 000000000000..267093ecc9eb --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_2.xml @@ -0,0 +1,31 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_0_3.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_3.xml new file mode 100644 index 000000000000..fb21254faf76 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_3.xml @@ -0,0 +1,35 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_0_4.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_4.xml new file mode 100644 index 000000000000..4f1e054b0f97 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_0_4.xml @@ -0,0 +1,39 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.917,0.761L12.146,0.286L11.073,4.192L12.844,4.666L13.917,0.761Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.002,3.661L16.706,2.365L13.86,5.211L15.157,6.507L18.002,3.661Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M20.123,8.938L19.868,7.123L15.858,7.632L16.113,9.447L20.123,8.938Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M19.443,13.831L19.979,12.078L16.103,10.898L15.567,12.651L19.443,13.831Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_1_0.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_0.xml new file mode 100644 index 000000000000..d151fee3e8ab --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_0.xml @@ -0,0 +1,27 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_1_1.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_1.xml new file mode 100644 index 000000000000..3e97a2e757f9 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_1.xml @@ -0,0 +1,31 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_1_2.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_2.xml new file mode 100644 index 000000000000..7bfd662c8261 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_2.xml @@ -0,0 +1,35 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_1_3.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_3.xml new file mode 100644 index 000000000000..bba33b348749 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_3.xml @@ -0,0 +1,39 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_1_4.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_4.xml new file mode 100644 index 000000000000..c0043166a121 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_1_4.xml @@ -0,0 +1,43 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.917,0.761L12.146,0.286L11.073,4.192L12.844,4.666L13.917,0.761Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.002,3.661L16.706,2.365L13.86,5.211L15.157,6.507L18.002,3.661Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M20.123,8.938L19.868,7.123L15.858,7.632L16.113,9.447L20.123,8.938Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M19.443,13.831L19.979,12.078L16.103,10.898L15.567,12.651L19.443,13.831Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_2_0.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_0.xml new file mode 100644 index 000000000000..d89ed87f7e40 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_0.xml @@ -0,0 +1,31 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_2_1.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_1.xml new file mode 100644 index 000000000000..e0a9c410e74b --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_1.xml @@ -0,0 +1,35 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_2_2.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_2.xml new file mode 100644 index 000000000000..8627af9ab88f --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_2.xml @@ -0,0 +1,39 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_2_3.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_3.xml new file mode 100644 index 000000000000..2c1139a3a042 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_3.xml @@ -0,0 +1,43 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_2_4.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_4.xml new file mode 100644 index 000000000000..8d920b182286 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_2_4.xml @@ -0,0 +1,47 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.917,0.761L12.146,0.286L11.073,4.192L12.844,4.666L13.917,0.761Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.002,3.661L16.706,2.365L13.86,5.211L15.157,6.507L18.002,3.661Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M20.123,8.938L19.868,7.123L15.858,7.632L16.113,9.447L20.123,8.938Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M19.443,13.831L19.979,12.078L16.103,10.898L15.567,12.651L19.443,13.831Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.937L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_3_0.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_0.xml new file mode 100644 index 000000000000..7fd4e17e51ca --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_0.xml @@ -0,0 +1,39 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.043,0.761L8.814,0.286L9.887,4.192L8.116,4.666L7.043,0.761Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.402,2.08L9.173,1.606L9.887,4.187L8.116,4.661L7.402,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.02,3.652L4.317,2.355L7.162,5.201L5.866,6.497L3.02,3.652Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.985,4.621L5.281,3.324L7.163,5.21L5.866,6.507L3.985,4.621Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M0.898,8.942L1.153,7.127L5.163,7.636L4.908,9.451L0.898,8.942Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.251,9.109L2.506,7.293L5.163,7.626L4.908,9.442L2.251,9.109Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.382L4.666,7.566L5.162,7.627L4.907,9.46L4.411,9.382Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M1.589,13.874L1.053,12.121L4.93,10.941L5.466,12.694L1.589,13.874Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.933,13.463L2.397,11.71L4.93,10.948L5.466,12.702L2.933,13.463Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.936L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_3_1.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_1.xml new file mode 100644 index 000000000000..f0f81506f446 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_1.xml @@ -0,0 +1,39 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.402,2.08L9.173,1.606L9.887,4.187L8.116,4.661L7.402,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.985,4.621L5.281,3.324L7.163,5.21L5.866,6.507L3.985,4.621Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.251,9.109L2.506,7.293L5.163,7.626L4.908,9.442L2.251,9.109Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.381L4.666,7.566L5.162,7.627L4.907,9.459L4.411,9.381Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.933,13.463L2.397,11.71L4.93,10.948L5.466,12.702L2.933,13.463Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.936L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_3_2.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_2.xml new file mode 100644 index 000000000000..1bb20170bc9b --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_2.xml @@ -0,0 +1,43 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.652L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.402,2.08L9.173,1.606L9.887,4.187L8.116,4.661L7.402,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.985,4.621L5.281,3.324L7.163,5.21L5.866,6.507L3.985,4.621Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.251,9.109L2.506,7.293L5.163,7.626L4.908,9.442L2.251,9.109Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.381L4.666,7.566L5.162,7.627L4.907,9.459L4.411,9.381Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.933,13.463L2.397,11.71L4.93,10.948L5.466,12.702L2.933,13.463Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.936L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_3_3.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_3.xml new file mode 100644 index 000000000000..a8bc0af46ccc --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_3.xml @@ -0,0 +1,47 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.652L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.402,2.08L9.173,1.606L9.887,4.187L8.116,4.661L7.402,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.985,4.621L5.281,3.324L7.163,5.21L5.866,6.507L3.985,4.621Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.251,9.109L2.506,7.293L5.163,7.626L4.908,9.442L2.251,9.109Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.381L4.666,7.566L5.162,7.627L4.907,9.459L4.411,9.381Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.933,13.463L2.397,11.71L4.93,10.948L5.466,12.702L2.933,13.463Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.936L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_3_4.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_4.xml new file mode 100644 index 000000000000..f8a58323e6ba --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_3_4.xml @@ -0,0 +1,51 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.917,0.761L12.146,0.286L11.073,4.192L12.844,4.666L13.917,0.761Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.002,3.661L16.706,2.365L13.86,5.211L15.157,6.507L18.002,3.661Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M20.123,8.938L19.868,7.123L15.858,7.632L16.113,9.447L20.123,8.938Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M19.443,13.831L19.979,12.078L16.103,10.898L15.567,12.651L19.443,13.831Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.652L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.402,2.08L9.173,1.606L9.887,4.187L8.116,4.661L7.402,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.765,3.415L9.536,2.94L9.887,4.194L8.116,4.669L7.765,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M7.98,4.19L9.751,3.716L9.887,4.19L8.116,4.665L7.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.985,4.621L5.281,3.324L7.162,5.21L5.866,6.507L3.985,4.621Z"/> + <path android:fillAlpha="0.4" android:fillColor="#D9D9D9" android:pathData="M4.941,5.574L6.238,4.278L7.162,5.202L5.866,6.498L4.941,5.574Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M5.523,6.152L6.82,4.856L7.165,5.198L5.869,6.494L5.523,6.152Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.251,9.109L2.506,7.293L5.163,7.626L4.908,9.442L2.251,9.109Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M3.658,9.284L3.913,7.469L5.163,7.625L4.908,9.44L3.658,9.284Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.411,9.381L4.666,7.566L5.162,7.627L4.907,9.459L4.411,9.381Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.933,13.463L2.397,11.71L4.93,10.948L5.466,12.702L2.933,13.463Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.254,13.058L3.718,11.304L4.923,10.942L5.459,12.695L4.254,13.058Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M4.919,12.853L4.383,11.1L4.919,10.936L5.455,12.69L4.919,12.853Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_4_0.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_0.xml new file mode 100644 index 000000000000..e5d7ad420441 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_0.xml @@ -0,0 +1,27 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M6.983,0.765L8.754,0.29L9.947,4.192L8.177,4.666L6.983,0.765Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.974,3.583L4.271,2.287L7.16,5.211L5.864,6.507L2.974,3.583Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M0.879,8.868L1.134,7.052L5.163,7.632L4.908,9.447L0.879,8.868Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M1.601,14.021L1.065,12.268L4.918,10.898L5.454,12.651L1.601,14.021Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_4_1.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_1.xml new file mode 100644 index 000000000000..f5cdf5d62db4 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_1.xml @@ -0,0 +1,31 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M6.983,0.765L8.754,0.29L9.947,4.192L8.177,4.666L6.983,0.765Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.974,3.583L4.271,2.287L7.16,5.211L5.864,6.507L2.974,3.583Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M0.879,8.868L1.134,7.052L5.163,7.632L4.908,9.447L0.879,8.868Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M1.601,14.021L1.065,12.268L4.918,10.898L5.454,12.651L1.601,14.021Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_4_2.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_2.xml new file mode 100644 index 000000000000..cbed634e4544 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_2.xml @@ -0,0 +1,35 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M6.983,0.765L8.754,0.29L9.947,4.192L8.177,4.666L6.983,0.765Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.974,3.583L4.271,2.287L7.16,5.211L5.864,6.507L2.974,3.583Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M0.879,8.868L1.134,7.052L5.163,7.632L4.908,9.447L0.879,8.868Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M1.601,14.021L1.065,12.268L4.918,10.898L5.454,12.651L1.601,14.021Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_4_3.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_3.xml new file mode 100644 index 000000000000..90d81d8bd9ec --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_3.xml @@ -0,0 +1,39 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M6.983,0.765L8.754,0.29L9.947,4.192L8.177,4.666L6.983,0.765Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.974,3.583L4.271,2.287L7.16,5.211L5.864,6.507L2.974,3.583Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M0.879,8.868L1.134,7.052L5.163,7.632L4.908,9.447L0.879,8.868Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M1.601,14.021L1.065,12.268L4.918,10.898L5.454,12.651L1.601,14.021Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.566,12.658L18.099,13.419Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> +</vector> diff --git a/packages/SettingsLib/res/drawable/ic_ambient_volume_4_4.xml b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_4.xml new file mode 100644 index 000000000000..f1a9a8a942b0 --- /dev/null +++ b/packages/SettingsLib/res/drawable/ic_ambient_volume_4_4.xml @@ -0,0 +1,43 @@ +<!-- + Copyright (C) 2024 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="22" + android:viewportHeight="22"> + <path android:fillColor="#ffffff" android:pathData="M17.987,18.375V20.987H3.013V18.375C3.013,17.862 3.145,17.379 3.409,16.928C3.674,16.477 4.039,16.135 4.506,15.902L4.506,15.902C5.302,15.496 6.199,15.153 7.199,14.872C8.197,14.591 9.298,14.45 10.5,14.45C11.702,14.45 12.802,14.591 13.801,14.872C14.8,15.153 15.698,15.496 16.494,15.902L16.494,15.902C16.961,16.135 17.326,16.477 17.59,16.928C17.855,17.379 17.987,17.862 17.987,18.375ZM10.5,13.487C9.472,13.487 8.593,13.121 7.861,12.389C7.129,11.657 6.763,10.778 6.763,9.75C6.763,8.722 7.129,7.843 7.861,7.111C8.593,6.379 9.472,6.013 10.5,6.013C11.528,6.013 12.407,6.379 13.139,7.111C13.871,7.843 14.237,8.722 14.237,9.75C14.237,10.778 13.871,11.657 13.139,12.389C12.407,13.121 11.528,13.487 10.5,13.487Z" android:strokeColor="#ffffff" android:strokeWidth="0.0255682"/> + <path android:fillColor="#D9D9D9" android:pathData="M6.983,0.765L8.754,0.29L9.947,4.192L8.177,4.666L6.983,0.765Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M2.975,3.583L4.271,2.287L7.16,5.211L5.864,6.507L2.975,3.583Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M0.878,8.868L1.134,7.052L5.163,7.632L4.907,9.447L0.878,8.868Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M1.601,14.021L1.065,12.268L4.918,10.898L5.454,12.651L1.601,14.021Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.917,0.761L12.146,0.286L11.073,4.192L12.844,4.666L13.917,0.761Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M18.002,3.661L16.706,2.365L13.86,5.211L15.157,6.507L18.002,3.661Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M20.123,8.938L19.868,7.123L15.858,7.632L16.113,9.447L20.123,8.938Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M19.443,13.831L19.979,12.078L16.103,10.898L15.567,12.651L19.443,13.831Z"/> + <path android:fillAlpha="0.4" android:fillColor="#D9D9D9" android:pathData="M13.558,2.08L11.787,1.606L11.073,4.187L12.844,4.661L13.558,2.08Z" android:strokeAlpha="0.4"/> + <path android:fillAlpha="0.4" android:fillColor="#D9D9D9" android:pathData="M17.038,4.63L15.742,3.334L13.86,5.22L15.157,6.517L17.038,4.63Z" android:strokeAlpha="0.4"/> + <path android:fillAlpha="0.4" android:fillColor="#D9D9D9" android:pathData="M18.77,9.105L18.515,7.289L15.858,7.622L16.113,9.438L18.77,9.105Z" android:strokeAlpha="0.4"/> + <path android:fillAlpha="0.4" android:fillColor="#D9D9D9" android:pathData="M18.099,13.419L18.635,11.666L16.103,10.905L15.567,12.658L18.099,13.419Z" android:strokeAlpha="0.4"/> + <path android:fillColor="#D9D9D9" android:pathData="M13.195,3.415L11.424,2.94L11.073,4.194L12.844,4.669L13.195,3.415Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.081,5.584L14.785,4.288L13.86,5.212L15.157,6.508L16.081,5.584Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M17.363,9.28L17.108,7.465L15.858,7.621L16.113,9.436L17.363,9.28Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.778,13.014L17.314,11.261L16.109,10.898L15.573,12.651L16.778,13.014Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M12.98,4.19L11.209,3.716L11.073,4.19L12.844,4.665L12.98,4.19Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M15.5,6.162L14.203,4.866L13.858,5.208L15.154,6.504L15.5,6.162Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.61,9.378L16.355,7.562L15.859,7.623L16.114,9.456L16.61,9.378Z"/> + <path android:fillColor="#D9D9D9" android:pathData="M16.113,12.81L16.649,11.057L16.113,10.893L15.577,12.646L16.113,12.81Z"/> +</vector> diff --git a/packages/SettingsLib/res/values-or/strings.xml b/packages/SettingsLib/res/values-or/strings.xml index 0d27f0012130..894273703dca 100644 --- a/packages/SettingsLib/res/values-or/strings.xml +++ b/packages/SettingsLib/res/values-or/strings.xml @@ -601,7 +601,7 @@ <string name="media_output_status_device_in_low_power_mode" msgid="8184631698321758451">"ଏଠାରେ ପ୍ଲେ କରିବା ପାଇଁ ଡିଭାଇସକୁ ସକ୍ରିୟ କରନ୍ତୁ"</string> <string name="media_output_status_unauthorized" msgid="5880222828273853838">"ପ୍ଲେ କରିବା ପାଇଁ ଡିଭାଇସକୁ ଅନୁମୋଦନ କରାଯାଇନାହିଁ"</string> <string name="media_output_status_track_unsupported" msgid="5576313219317709664">"ଏଠାରେ ମିଡିଆ ପ୍ଲେ କରାଯାଇପାରିବ ନାହିଁ"</string> - <string name="tv_media_transfer_connected" msgid="5145011475885290725">"କନେକ୍ଟ କରାଯାଇଛି"</string> + <string name="tv_media_transfer_connected" msgid="5145011475885290725">"କନେକ୍ଟ ହୋଇଛି"</string> <string name="tv_media_transfer_arc_fallback_title" msgid="3674360098755328601">"HDMI ARC"</string> <string name="tv_media_transfer_earc_fallback_title" msgid="3098685494578519940">"HDMI eARC"</string> <string name="tv_media_transfer_arc_subtitle" msgid="1040017851325069082">"ARC ମାଧ୍ୟମରେ କନେକ୍ଟ କରାଯାଇଛି"</string> diff --git a/packages/SettingsLib/res/values-sq/strings.xml b/packages/SettingsLib/res/values-sq/strings.xml index 504d821a95d9..2676d0ee083c 100644 --- a/packages/SettingsLib/res/values-sq/strings.xml +++ b/packages/SettingsLib/res/values-sq/strings.xml @@ -313,7 +313,7 @@ <string name="bluetooth_select_a2dp_codec_bits_per_sample_dialog_title" msgid="4898693684282596143">"Aktivizo kodekun e audios me Bluetooth\nZgjedhja: Bite për shembull"</string> <string name="bluetooth_select_a2dp_codec_channel_mode" msgid="364277285688014427">"Modaliteti i kanalit të audios me Bluetooth"</string> <string name="bluetooth_select_a2dp_codec_channel_mode_dialog_title" msgid="2076949781460359589">"Aktivizo kodekun e audios me Bluetooth\nZgjedhja: Modaliteti i kanalit"</string> - <string name="bluetooth_select_a2dp_codec_ldac_playback_quality" msgid="3233402355917446304">"Kodeku LDAC i audios së Bluetooth-it: Cilësia e luajtjes"</string> + <string name="bluetooth_select_a2dp_codec_ldac_playback_quality" msgid="3233402355917446304">"Kodeku LDAC i audios me Bluetooth: Cilësia e luajtjes"</string> <string name="bluetooth_select_a2dp_codec_ldac_playback_quality_dialog_title" msgid="7274396574659784285">"Aktivizo LDAC të audios me Bluetooth\nZgjedhja e kodekut: Cilësia e luajtjes"</string> <string name="bluetooth_select_a2dp_codec_streaming_label" msgid="2040810756832027227">"Transmetimi: <xliff:g id="STREAMING_PARAMETER">%1$s</xliff:g>"</string> <string name="select_private_dns_configuration_title" msgid="7887550926056143018">"DNS-ja private"</string> @@ -586,8 +586,7 @@ <string name="media_transfer_this_device_name" msgid="2357329267148436433">"Ky telefon"</string> <string name="media_transfer_this_device_name_tablet" msgid="2975593806278422086">"Ky tablet"</string> <string name="media_transfer_this_device_name_desktop" msgid="7912386128141470452">"Ky kompjuter (i brendshëm)"</string> - <!-- no translation found for media_transfer_this_device_name_tv (8508713779441163887) --> - <skip /> + <string name="media_transfer_this_device_name_tv" msgid="8508713779441163887">"Ky televizor"</string> <string name="media_transfer_dock_speaker_device_name" msgid="2856219597113881950">"Altoparlanti i stacionit"</string> <string name="media_transfer_external_device_name" msgid="2588672258721846418">"Pajisja e jashtme"</string> <string name="media_transfer_default_device_name" msgid="4315604017399871828">"Pajisja e lidhur"</string> @@ -607,10 +606,8 @@ <string name="tv_media_transfer_earc_fallback_title" msgid="3098685494578519940">"HDMI eARC"</string> <string name="tv_media_transfer_arc_subtitle" msgid="1040017851325069082">"Lidhur përmes ARC-së"</string> <string name="tv_media_transfer_earc_subtitle" msgid="645191413103303077">"Lidhur përmes eARC-së"</string> - <!-- no translation found for tv_media_transfer_internal_speakers (4662765121700213785) --> - <skip /> - <!-- no translation found for tv_media_transfer_hdmi_title (6715658310934507444) --> - <skip /> + <string name="tv_media_transfer_internal_speakers" msgid="4662765121700213785">"Altoparlanti i integruar"</string> + <string name="tv_media_transfer_hdmi_title" msgid="6715658310934507444">"Audioja e televizorit"</string> <string name="profile_connect_timeout_subtext" msgid="4043408193005851761">"Problem me lidhjen. Fike dhe ndize përsëri pajisjen"</string> <string name="media_transfer_wired_device_name" msgid="4447880899964056007">"Pajisja audio me tel"</string> <string name="help_label" msgid="3528360748637781274">"Ndihma dhe komentet"</string> diff --git a/packages/SettingsLib/res/values-uk/arrays.xml b/packages/SettingsLib/res/values-uk/arrays.xml index 6032efbf3ed1..234af3680512 100644 --- a/packages/SettingsLib/res/values-uk/arrays.xml +++ b/packages/SettingsLib/res/values-uk/arrays.xml @@ -257,12 +257,12 @@ <item msgid="1212561935004167943">"Тест. команди малювання зеленим"</item> </string-array> <string-array name="track_frame_time_entries"> - <item msgid="634406443901014984">"Вимк."</item> + <item msgid="634406443901014984">"Вимкнено"</item> <item msgid="1288760936356000927">"На екрані у вигляді смужок"</item> <item msgid="5023908510820531131">"У команді \"<xliff:g id="AS_TYPED_COMMAND">adb shell dumpsys gfxinfo</xliff:g>\""</item> </string-array> <string-array name="debug_hw_overdraw_entries"> - <item msgid="1968128556747588800">"Вимк."</item> + <item msgid="1968128556747588800">"Вимкнено"</item> <item msgid="3033215374382962216">"Показувати області накладання"</item> <item msgid="3474333938380896988">"Показувати області дейтераномалії"</item> </string-array> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index ebeee8564d2f..ea8ae7b208cd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -242,8 +242,7 @@ public class SettingsHelper { // Don't write it to setting. Let the broadcast receiver in // AccessibilityManagerService handle restore/merging logic. return; - } else if (android.view.accessibility.Flags.restoreA11yShortcutTargetService() - && Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE.equals(name)) { + } else if (Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE.equals(name)) { // Don't write it to setting. Let the broadcast receiver in // AccessibilityManagerService handle restore/merging logic. return; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index 011ffbc97d19..c0e61eefb4dd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -178,11 +178,6 @@ final class SettingsState { private static final String APEX_DIR = "/apex"; private static final String APEX_ACONFIG_PATH_SUFFIX = "/etc/aconfig_flags.pb"; - private static final String STORAGE_MIGRATION_FLAG = - "core_experiments_team_internal/com.android.providers.settings.storage_test_mission_1"; - private static final String STORAGE_MIGRATION_MARKER_FILE = - "/metadata/aconfig_test_missions/mission_1"; - /** * This tag is applied to all aconfig default value-loaded flags. */ @@ -1753,32 +1748,6 @@ final class SettingsState { } } - if (isConfigSettingsKey(mKey) && name != null - && name.equals(STORAGE_MIGRATION_FLAG)) { - if (value.equals("true")) { - Path path = Paths.get(STORAGE_MIGRATION_MARKER_FILE); - if (!Files.exists(path)) { - Files.createFile(path); - } - - Set<PosixFilePermission> perms = - Files.readAttributes(path, PosixFileAttributes.class).permissions(); - perms.add(PosixFilePermission.OWNER_WRITE); - perms.add(PosixFilePermission.OWNER_READ); - perms.add(PosixFilePermission.GROUP_READ); - perms.add(PosixFilePermission.OTHERS_READ); - try { - Files.setPosixFilePermissions(path, perms); - } catch (Exception e) { - Slog.e(LOG_TAG, "failed to set permissions on migration marker", e); - } - } else { - java.nio.file.Path path = Paths.get(STORAGE_MIGRATION_MARKER_FILE); - if (Files.exists(path)) { - Files.delete(path); - } - } - } mSettings.put(name, new Setting(name, value, defaultValue, packageName, tag, fromSystem, Long.valueOf(id), isPreservedInRestore)); diff --git a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java index f64f72a74609..048d93b09967 100644 --- a/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java +++ b/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsHelperRestoreTest.java @@ -26,8 +26,6 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; -import android.platform.test.annotations.EnableFlags; -import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.provider.SettingsStringUtil; @@ -37,7 +35,6 @@ import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.test.BroadcastInterceptingContext; import org.junit.Before; -import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; @@ -52,9 +49,6 @@ import java.util.concurrent.ExecutionException; @RunWith(AndroidJUnit4.class) public class SettingsHelperRestoreTest { - @Rule - public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); - private static final float FLOAT_TOLERANCE = 0.01f; private Context mContext; @@ -211,7 +205,6 @@ public class SettingsHelperRestoreTest { } @Test - @EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE) public void restoreAccessibilityShortcutTargetService_broadcastSent() throws ExecutionException, InterruptedException { BroadcastInterceptingContext interceptingContext = new BroadcastInterceptingContext( diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 0ec5571a7b8f..fa6e2dbe02f3 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -65,7 +65,6 @@ <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" /> <uses-permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" /> <uses-permission android:name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE" /> - <uses-permission android:name="android.permission.READ_DROPBOX_DATA" /> <uses-permission android:name="android.permission.READ_LOGS" /> <uses-permission android:name="android.permission.BRIGHTNESS_SLIDER_USAGE" /> <uses-permission android:name="android.permission.ACCESS_AMBIENT_LIGHT_STATS" /> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index e0117368515b..5519b5171090 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -459,7 +459,7 @@ android:label="@string/screenshot_scroll_label" android:finishOnTaskLaunch="true" /> - <service android:name=".screenshot.ScreenshotProxyService" + <service android:name=".screenshot.proxy.ScreenshotProxyService" android:permission="com.android.systemui.permission.SELF" android:exported="false" /> @@ -490,6 +490,7 @@ <activity android:name=".touchpad.tutorial.ui.view.TouchpadTutorialActivity" android:exported="true" android:showForAllUsers="true" + android:excludeFromRecents="true" android:theme="@style/Theme.AppCompat.NoActionBar"> <intent-filter> <action android:name="com.android.systemui.action.TOUCHPAD_TUTORIAL"/> @@ -500,6 +501,7 @@ <activity android:name=".inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity" android:exported="true" android:showForAllUsers="true" + android:excludeFromRecents="true" android:theme="@style/Theme.AppCompat.NoActionBar"> <intent-filter> <action android:name="com.android.systemui.action.TOUCHPAD_KEYBOARD_TUTORIAL"/> diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java index 6bc0f42f39aa..a60778658c59 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/view/A11yMenuOverlayLayout.java @@ -57,7 +57,6 @@ import androidx.annotation.UiContext; import com.android.app.viewcapture.ViewCaptureAwareWindowManager; import com.android.systemui.accessibility.accessibilitymenu.AccessibilityMenuService; -import com.android.systemui.accessibility.accessibilitymenu.Flags; import com.android.systemui.accessibility.accessibilitymenu.R; import com.android.systemui.accessibility.accessibilitymenu.activity.A11yMenuSettingsActivity.A11yMenuPreferenceFragment; import com.android.systemui.accessibility.accessibilitymenu.model.A11yMenuShortcut; @@ -383,9 +382,7 @@ public class A11yMenuOverlayLayout { return; } snackbar.setText(text); - if (Flags.a11yMenuSnackbarLiveRegion()) { - snackbar.setAccessibilityLiveRegion(ACCESSIBILITY_LIVE_REGION_POLITE); - } + snackbar.setAccessibilityLiveRegion(ACCESSIBILITY_LIVE_REGION_POLITE); // Remove any existing fade-out animation before starting any new animations. mHandler.removeCallbacksAndMessages(null); diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 02e7b5f96866..c1f786826922 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -427,6 +427,18 @@ flag { } } + +flag { + name: "status_bar_chips_modernization" + namespace: "systemui" + description: "Deprecate OngoingCallController and implement OngoingActivityChips" + "in compose" + bug: "372657935" + metadata { + purpose: PURPOSE_BUGFIX + } +} + flag { name: "status_bar_use_repos_for_call_chip" namespace: "systemui" @@ -1204,6 +1216,13 @@ flag { } flag { + name: "communal_responsive_grid" + namespace: "systemui" + description: "Enables responsive grid on glanceable hub" + bug: "378171351" +} + +flag { name: "communal_standalone_support" namespace: "systemui" description: "Support communal features without a dock" @@ -1782,16 +1801,6 @@ flag { } flag { - name: "ensure_enr_views_visibility" - namespace: "systemui" - description: "Ensures public and private visibilities" - bug: "361552380" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "shade_expands_on_status_bar_long_press" namespace: "systemui" description: "Expands the shade on long press of any status bar" @@ -1863,3 +1872,17 @@ flag { description: "Implement the depth push scaling effect on Launcher when users pull down shade." bug: "370562309" } + +flag { + name: "spatial_model_app_pushback" + namespace: "systemui" + description: "Implement the depth push scaling effect on the current app when users pull down shade." + bug: "370560660" +} + +flag { + name: "expanded_privacy_indicators_on_large_screen" + namespace: "systemui" + description: "Larger privacy indicators on large screen" + bug: "381864715" +} diff --git a/packages/SystemUI/animation/lib/src/com/android/systemui/animation/ViewUIComponent.java b/packages/SystemUI/animation/lib/src/com/android/systemui/animation/ViewUIComponent.java index cec740ad899b..0317d5f095a1 100644 --- a/packages/SystemUI/animation/lib/src/com/android/systemui/animation/ViewUIComponent.java +++ b/packages/SystemUI/animation/lib/src/com/android/systemui/animation/ViewUIComponent.java @@ -57,6 +57,14 @@ public class ViewUIComponent implements UIComponent { mView = view; } + /** + * @return the view wrapped by this UI component. + * @hide + */ + public View getView() { + return mView; + } + @Override public float getAlpha() { return mView.getAlpha(); diff --git a/packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java b/packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java index 6b26ac5f4692..3b66460140c9 100644 --- a/packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java +++ b/packages/SystemUI/animation/lib/src/com/android/systemui/animation/server/IOriginTransitionsImpl.java @@ -438,7 +438,8 @@ public class IOriginTransitionsImpl extends IOriginTransitions.Stub { if (forPredictiveBackTakeover) { filter.mTypeSet = new int[] {TRANSIT_PREPARE_BACK_NAVIGATION}; } else { - filter.mTypeSet = new int[] {TRANSIT_CLOSE, TRANSIT_TO_BACK}; + filter.mTypeSet = + new int[] {TRANSIT_CLOSE, TRANSIT_TO_BACK, TRANSIT_OPEN, TRANSIT_TO_FRONT}; } // The opening activity of the return transition must match the activity we just closed. diff --git a/packages/SystemUI/checks/src/com/android/internal/systemui/lint/ShadeDisplayAwareDetector.kt b/packages/SystemUI/checks/src/com/android/internal/systemui/lint/ShadeDisplayAwareDetector.kt new file mode 100644 index 000000000000..2f83d82bbec7 --- /dev/null +++ b/packages/SystemUI/checks/src/com/android/internal/systemui/lint/ShadeDisplayAwareDetector.kt @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.internal.systemui.lint + +import com.android.tools.lint.client.api.UElementHandler +import com.android.tools.lint.detector.api.Category +import com.android.tools.lint.detector.api.Detector +import com.android.tools.lint.detector.api.Implementation +import com.android.tools.lint.detector.api.Issue +import com.android.tools.lint.detector.api.JavaContext +import com.android.tools.lint.detector.api.Scope +import com.android.tools.lint.detector.api.Severity +import com.android.tools.lint.detector.api.SourceCodeScanner +import org.jetbrains.uast.UClass +import org.jetbrains.uast.getContainingUFile + +class ShadeDisplayAwareDetector : Detector(), SourceCodeScanner { + override fun getApplicableUastTypes() = listOf(UClass::class.java) + + override fun createUastHandler(context: JavaContext) = + object : UElementHandler() { + override fun visitClass(node: UClass) { + for (constructor in node.constructors) { + // Visit all injected constructors in shade-relevant packages + if (!constructor.hasAnnotation(INJECT_ANNOTATION)) continue + if (!isInRelevantShadePackage(node)) continue + if (IGNORED_PACKAGES.contains(node.qualifiedName)) continue + + // Check the any context-dependent parameter to see if it has @ShadeDisplayAware + // annotation + for (parameter in constructor.parameterList.parameters) { + val shouldReport = + CONTEXT_DEPENDENT_SHADE_CLASSES.contains( + parameter.type.canonicalText + ) && !parameter.hasAnnotation(SHADE_DISPLAY_AWARE_ANNOTATION) + if (shouldReport) { + context.report( + issue = ISSUE, + scope = parameter.declarationScope, + location = context.getNameLocation(parameter), + message = reportMsg(className = parameter.type.presentableText), + ) + } + } + } + } + } + + companion object { + private const val INJECT_ANNOTATION = "javax.inject.Inject" + private const val SHADE_DISPLAY_AWARE_ANNOTATION = + "com.android.systemui.shade.ShadeDisplayAware" + + private val CONTEXT_DEPENDENT_SHADE_CLASSES = + setOf( + "android.content.Context", + "android.view.WindowManager", + "android.view.LayoutInflater", + "android.content.res.Resources", + "com.android.systemui.common.ui.ConfigurationState", + "com.android.systemui.statusbar.policy.ConfigurationController", + "com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor", + ) + + private val SHADE_WINDOW_PACKAGES = + listOf( + "com.android.systemui.biometrics", + "com.android.systemui.bouncer", + "com.android.systemui.keyboard.docking.ui.viewmodel", + "com.android.systemui.qs", + "com.android.systemui.shade", + "com.android.systemui.statusbar.notification", + "com.android.systemui.unfold.domain.interactor", + ) + + private val IGNORED_PACKAGES = + setOf( + "com.android.systemui.biometrics.UdfpsController", + "com.android.systemui.qs.customize.TileAdapter", + ) + + private fun isInRelevantShadePackage(node: UClass): Boolean { + val packageName = node.getContainingUFile()?.packageName + if (packageName.isNullOrBlank()) return false + return SHADE_WINDOW_PACKAGES.any { relevantPackage -> + packageName.startsWith(relevantPackage) + } + } + + private fun reportMsg(className: String) = + """UI elements of the shade window + |should use ShadeDisplayAware-annotated $className, as the shade might move between windows, and only + |@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so + |might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme). + |If the usage of $className is not related to display specific configuration or UI, then there is + |technically no need to use the annotation, and you can annotate the class with + |@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker") + |""" + .trimMargin() + + @JvmField + val ISSUE: Issue = + Issue.create( + id = "ShadeDisplayAwareContextChecker", + briefDescription = "Using non-ShadeDisplayAware component within shade", + explanation = + """ + Any context-dependent components (Resources, LayoutInflater, ConfigurationState, + etc.) being injected into Shade-relevant classes must have the @ShadeDisplayAware + annotation to ensure they work with when the shade is moved to a different display. + When the shade is moved, the configuration might change, and only @ShadeDisplayAware + components will update accordingly to reflect the new display. + """ + .trimIndent(), + category = Category.CORRECTNESS, + priority = 8, + severity = Severity.ERROR, + implementation = + Implementation(ShadeDisplayAwareDetector::class.java, Scope.JAVA_FILE_SCOPE), + ) + } +} diff --git a/packages/SystemUI/checks/src/com/android/internal/systemui/lint/SystemUIIssueRegistry.kt b/packages/SystemUI/checks/src/com/android/internal/systemui/lint/SystemUIIssueRegistry.kt index a1f4f5507e5f..6d18f9377806 100644 --- a/packages/SystemUI/checks/src/com/android/internal/systemui/lint/SystemUIIssueRegistry.kt +++ b/packages/SystemUI/checks/src/com/android/internal/systemui/lint/SystemUIIssueRegistry.kt @@ -46,8 +46,9 @@ class SystemUIIssueRegistry : IssueRegistry() { DemotingTestWithoutBugDetector.ISSUE, TestFunctionNameViolationDetector.ISSUE, MissingApacheLicenseDetector.ISSUE, + ShadeDisplayAwareDetector.ISSUE, RegisterContentObserverSyncViaSettingsProxyDetector.SYNC_WARNING, - RegisterContentObserverViaContentResolverDetector.CONTENT_RESOLVER_ERROR + RegisterContentObserverViaContentResolverDetector.CONTENT_RESOLVER_ERROR, ) override val api: Int @@ -60,6 +61,6 @@ class SystemUIIssueRegistry : IssueRegistry() { Vendor( vendorName = "Android", feedbackUrl = "http://b/issues/new?component=78010", - contact = "jernej@google.com" + contact = "jernej@google.com", ) } diff --git a/packages/SystemUI/checks/tests/com/android/internal/systemui/lint/ShadeDisplayAwareDetectorTest.kt b/packages/SystemUI/checks/tests/com/android/internal/systemui/lint/ShadeDisplayAwareDetectorTest.kt new file mode 100644 index 000000000000..58ad363f5b57 --- /dev/null +++ b/packages/SystemUI/checks/tests/com/android/internal/systemui/lint/ShadeDisplayAwareDetectorTest.kt @@ -0,0 +1,375 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.android.internal.systemui.lint + +import com.android.tools.lint.checks.infrastructure.TestFile +import com.android.tools.lint.checks.infrastructure.TestFiles +import com.android.tools.lint.checks.infrastructure.TestMode +import com.android.tools.lint.detector.api.Detector +import com.android.tools.lint.detector.api.Issue +import org.junit.Test + +class ShadeDisplayAwareDetectorTest : SystemUILintDetectorTest() { + override fun getDetector(): Detector = ShadeDisplayAwareDetector() + + override fun getIssues(): List<Issue> = listOf(ShadeDisplayAwareDetector.ISSUE) + + private val qsContext: TestFile = + java( + """ + package com.android.systemui.qs.dagger; + + import static java.lang.annotation.RetentionPolicy.RUNTIME; + + import java.lang.annotation.Retention; + + @Retention(RUNTIME) public @interface QSThemedContext {} + """ + ) + .indented() + + private val injectStub: TestFile = + kotlin( + """ + package javax.inject + + @Retention(AnnotationRetention.RUNTIME) annotation class Inject + """ + ) + .indented() + + private val shadeDisplayAwareStub: TestFile = + kotlin( + """ + package com.android.systemui.shade + + @Retention(AnnotationRetention.RUNTIME) annotation class ShadeDisplayAware + """ + ) + .indented() + + private val configStateStub: TestFile = + kotlin( + """ + package com.android.systemui.common.ui + + class ConfigurationState + """ + ) + .indented() + + private val configControllerStub: TestFile = + kotlin( + """ + package com.android.systemui.statusbar.policy + + class ConfigurationController + """ + ) + .indented() + + private val configInteractorStub: TestFile = + kotlin( + """ + package com.android.systemui.common.ui.domain.interactor + + class ConfigurationInteractor + """ + ) + .indented() + + private val otherStubs = + arrayOf( + injectStub, + qsContext, + shadeDisplayAwareStub, + configStateStub, + configControllerStub, + configInteractorStub, + ) + + @Test + fun injectedConstructor_inRelevantPackage_withRelevantParameter_withoutAnnotation() { + lint() + .files( + TestFiles.kotlin( + """ + package com.android.systemui.shade.example + + import javax.inject.Inject + import android.content.Context + + class ExampleClass + @Inject + constructor(private val context: Context) + """ + .trimIndent() + ), + *androidStubs, + *otherStubs, + ) + .issues(ShadeDisplayAwareDetector.ISSUE) + .testModes(TestMode.DEFAULT) + .run() + .expectErrorCount(1) + .expectContains(errorMsgString(8, "Context")) + .expectContains("[ShadeDisplayAwareContextChecker]") + .expectContains( + "constructor(private val context: Context)\n" + + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ) + .expectContains("1 errors, 0 warnings") + } + + @Test + fun injectedConstructor_inRelevantPackage_withMultipleRelevantParameters_withoutAnnotation() { + lint() + .files( + TestFiles.kotlin( + """ + package com.android.systemui.shade.example + + import javax.inject.Inject + import android.content.Context + import android.content.res.Resources + import android.view.LayoutInflater + import android.view.WindowManager + import com.android.systemui.common.ui.ConfigurationState + import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor + import com.android.systemui.statusbar.policy.ConfigurationController + + class ExampleClass + @Inject + constructor( + private val context: Context, + private val inflater: LayoutInflater, + private val windowManager: WindowManager, + private val configState: ConfigurationState, + private val configController: ConfigurationController, + private val configInteractor: ConfigurationInteractor, + ) + """ + .trimIndent() + ), + *androidStubs, + *otherStubs, + ) + .issues(ShadeDisplayAwareDetector.ISSUE) + .testModes(TestMode.DEFAULT) + .run() + .expectErrorCount(6) + .expectContains(errorMsgString(lineNumber = 15, className = "Context")) + .expectContains( + "private val context: Context,\n" + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ) + .expectContains(errorMsgString(lineNumber = 16, className = "LayoutInflater")) + .expectContains( + "private val inflater: LayoutInflater,\n" + + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ) + .expectContains(errorMsgString(lineNumber = 17, className = "WindowManager")) + .expectContains( + "private val windowManager: WindowManager,\n" + + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ) + .expectContains(errorMsgString(lineNumber = 18, className = "ConfigurationState")) + .expectContains( + "private val configState: ConfigurationState,\n" + + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ) + .expectContains(errorMsgString(lineNumber = 19, className = "ConfigurationController")) + .expectContains( + "private val configController: ConfigurationController,\n" + + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ) + .expectContains(errorMsgString(lineNumber = 20, className = "ConfigurationInteractor")) + .expectContains( + "private val configInteractor: ConfigurationInteractor,\n" + + " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ) + .expectContains(" [ShadeDisplayAwareContextChecker]") + } + + @Test + fun injectedConstructor_inRelevantPackage_withRelevantParameter_withAnnotation() { + lint() + .files( + TestFiles.kotlin( + """ + package com.android.systemui.shade.example + + import javax.inject.Inject + import android.content.Context + import com.android.systemui.shade.ShadeDisplayAware + + class ExampleClass + @Inject + constructor(@ShadeDisplayAware private val context: Context) + """ + .trimIndent() + ), + *androidStubs, + *otherStubs, + ) + .issues(ShadeDisplayAwareDetector.ISSUE) + .testModes(TestMode.DEFAULT) + .run() + .expectClean() + } + + @Test + fun injectedConstructor_inRelevantPackage_withoutRelevantParameter_withoutAnnotation() { + lint() + .files( + TestFiles.kotlin( + """ + package com.android.systemui.shade.example + + import javax.inject.Inject + import android.content.ContextWrapper + + class ExampleClass + @Inject + constructor(private val contextWrapper: ContextWrapper) + """ + .trimIndent() + ), + *androidStubs, + *otherStubs, + ) + .issues(ShadeDisplayAwareDetector.ISSUE) + .testModes(TestMode.DEFAULT) + .run() + .expectClean() + } + + @Test + fun injectedConstructor_notInRelevantPackage_withRelevantParameter_withoutAnnotation() { + lint() + .files( + TestFiles.kotlin( + """ + package com.android.systemui.keyboard + + import javax.inject.Inject + import android.content.Context + + class ExampleClass @Inject constructor(private val context: Context) + """ + .trimIndent() + ), + *androidStubs, + *otherStubs, + ) + .issues(ShadeDisplayAwareDetector.ISSUE) + .testModes(TestMode.DEFAULT) + .run() + .expectClean() + } + + @Test + fun nonInjectedConstructor_inRelevantPackage_withRelevantParameter_withoutAnnotation() { + lint() + .files( + TestFiles.kotlin( + """ + package com.android.systemui.shade.example + + import android.content.Context + + class ExampleClass(private val context: Context) + """ + .trimIndent() + ), + *androidStubs, + *otherStubs, + ) + .issues(ShadeDisplayAwareDetector.ISSUE) + .testModes(TestMode.DEFAULT) + .run() + .expectClean() + } + + @Test + fun injectedConstructor_inRelevantPackage_withRelevantParameter_withoutAnnotation_suppressed() { + lint() + .files( + TestFiles.kotlin( + """ + package com.android.systemui.shade.example + + import javax.inject.Inject + import android.content.Context + + @Suppress("ShadeDisplayAwareContextChecker") + class ExampleClass + @Inject + constructor( + private val context: Context + ) + """ + .trimIndent() + ), + *androidStubs, + *otherStubs, + ) + .issues(ShadeDisplayAwareDetector.ISSUE) + .testModes(TestMode.DEFAULT) + .run() + .expectClean() + } + + @Test + fun injectedConstructor_inExemptPackage_withRelevantParameter_withoutAnnotation() { + lint() + .files( + TestFiles.java( + """ + package com.android.systemui.qs.customize; + + import javax.inject.Inject; + import com.android.systemui.qs.dagger.QSThemedContext; + import android.content.Context; + + public class TileAdapter { + @Inject + public TileAdapter(@QSThemedContext Context context) {} + } + """ + .trimIndent() + ), + *androidStubs, + *otherStubs, + ) + .issues(ShadeDisplayAwareDetector.ISSUE) + .testModes(TestMode.DEFAULT) + .run() + .expectClean() + } + + private fun errorMsgString(lineNumber: Int, className: String) = + """ + src/com/android/systemui/shade/example/ExampleClass.kt:$lineNumber: Error: UI elements of the shade window + should use ShadeDisplayAware-annotated $className, as the shade might move between windows, and only + @ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so + might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme). + If the usage of $className is not related to display specific configuration or UI, then there is + technically no need to use the annotation, and you can annotate the class with + @SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker") + """ +} diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt index 787edfb9168c..573e5ca5e2d5 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt @@ -66,6 +66,7 @@ import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyGridScope import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid import androidx.compose.foundation.lazy.grid.itemsIndexed @@ -169,6 +170,7 @@ import com.android.compose.modifiers.thenIf import com.android.compose.ui.graphics.painter.rememberDrawablePainter import com.android.internal.R.dimen.system_app_widget_background_radius import com.android.systemui.Flags +import com.android.systemui.Flags.communalResponsiveGrid import com.android.systemui.Flags.communalTimerFlickerFix import com.android.systemui.Flags.communalWidgetResizing import com.android.systemui.communal.domain.model.CommunalContentModel @@ -194,7 +196,6 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.statusbar.phone.SystemUIDialogFactory import kotlin.math.max import kotlin.math.min -import kotlin.math.roundToInt import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -693,7 +694,12 @@ private fun ResizableItemFrameWrapper( onResize = onResize, minHeightPx = minHeightPx, maxHeightPx = maxHeightPx, - resizeMultiple = CommunalContentSize.HALF.span, + resizeMultiple = + if (communalResponsiveGrid()) { + 1 + } else { + CommunalContentSize.FixedSize.HALF.span + }, ) { content(Modifier) } @@ -701,14 +707,22 @@ private fun ResizableItemFrameWrapper( } @Composable -fun calculateWidgetSize(item: CommunalContentModel, isResizable: Boolean): WidgetSizeInfo { +fun calculateWidgetSize( + cellHeight: Dp?, + availableHeight: Dp?, + item: CommunalContentModel, + isResizable: Boolean, +): WidgetSizeInfo { val density = LocalDensity.current + val minHeight = cellHeight ?: CommunalContentSize.FixedSize.HALF.dp() + val maxHeight = availableHeight ?: CommunalContentSize.FixedSize.FULL.dp() + return if (isResizable && item is CommunalContentModel.WidgetContent.Widget) { with(density) { val minHeightPx = (min(item.providerInfo.minResizeHeight, item.providerInfo.minHeight) - .coerceAtLeast(CommunalContentSize.HALF.dp().toPx().roundToInt())) + .coerceAtLeast(minHeight.roundToPx())) val maxHeightPx = (if (item.providerInfo.maxResizeHeight > 0) { @@ -716,7 +730,7 @@ fun calculateWidgetSize(item: CommunalContentModel, isResizable: Boolean): Widge } else { Int.MAX_VALUE }) - .coerceIn(minHeightPx, CommunalContentSize.FULL.dp().toPx().roundToInt()) + .coerceIn(minHeightPx, maxHeight.roundToPx()) WidgetSizeInfo(minHeightPx, maxHeightPx) } @@ -725,6 +739,37 @@ fun calculateWidgetSize(item: CommunalContentModel, isResizable: Boolean): Widge } } +@Composable +private fun HorizontalGridWrapper( + contentPadding: PaddingValues, + gridState: LazyGridState, + modifier: Modifier = Modifier, + content: LazyGridScope.(sizeInfo: SizeInfo?) -> Unit, +) { + if (communalResponsiveGrid()) { + ResponsiveLazyHorizontalGrid( + cellAspectRatio = 1.5f, + modifier = modifier, + state = gridState, + minContentPadding = contentPadding, + minHorizontalArrangement = Dimensions.ItemSpacing, + minVerticalArrangement = Dimensions.ItemSpacing, + content = content, + ) + } else { + LazyHorizontalGrid( + modifier = modifier, + state = gridState, + rows = GridCells.Fixed(CommunalContentSize.FixedSize.FULL.span), + contentPadding = contentPadding, + horizontalArrangement = Arrangement.spacedBy(Dimensions.ItemSpacing), + verticalArrangement = Arrangement.spacedBy(Dimensions.ItemSpacing), + ) { + content(null) + } + } +} + @OptIn(ExperimentalFoundationApi::class) @Composable private fun BoxScope.CommunalHubLazyGrid( @@ -778,28 +823,32 @@ private fun BoxScope.CommunalHubLazyGrid( // Since the grid has its own listener for in-grid drag events, we use a separate element // for android drag events. Box(Modifier.fillMaxSize().dragAndDropTarget(dragAndDropTargetState)) {} + } else if (communalResponsiveGrid()) { + gridModifier = gridModifier.fillMaxSize() } else { gridModifier = gridModifier.height(hubDimensions.GridHeight) } - val itemArrangement = Arrangement.spacedBy(Dimensions.ItemSpacing) - LazyHorizontalGrid( + HorizontalGridWrapper( modifier = gridModifier, - state = gridState, - rows = GridCells.Fixed(CommunalContentSize.FULL.span), + gridState = gridState, contentPadding = contentPadding, - horizontalArrangement = itemArrangement, - verticalArrangement = itemArrangement, - ) { + ) { sizeInfo -> itemsIndexed( items = list, key = { _, item -> item.key }, contentType = { _, item -> item.key }, - span = { _, item -> GridItemSpan(item.size.span) }, + span = { _, item -> GridItemSpan(item.getSpanOrMax(sizeInfo?.gridSize?.height)) }, ) { index, item -> - val size = SizeF(Dimensions.CardWidth.value, item.size.dp().value) + val currentItemSpan = item.getSpanOrMax(sizeInfo?.gridSize?.height) + val dpSize = + if (sizeInfo != null) { + DpSize(sizeInfo.cellSize.width, sizeInfo.calculateHeight(currentItemSpan)) + } else { + DpSize(Dimensions.CardWidth, (item.size as CommunalContentSize.FixedSize).dp()) + } + val size = SizeF(dpSize.width.value, dpSize.height.value) val selected = item.key == selectedKey.value - val dpSize = DpSize(size.width.dp, size.height.dp) val isResizable = if (item is CommunalContentModel.WidgetContent.Widget) { item.providerInfo.resizeMode and AppWidgetProviderInfo.RESIZE_VERTICAL != 0 @@ -809,7 +858,7 @@ private fun BoxScope.CommunalHubLazyGrid( val resizeableItemFrameViewModel = rememberViewModel( - key = item.size.span, + key = currentItemSpan, traceName = "ResizeableItemFrame.viewModel.$index", ) { ResizeableItemFrameViewModel() @@ -822,13 +871,23 @@ private fun BoxScope.CommunalHubLazyGrid( animationSpec = spring(stiffness = Spring.StiffnessMediumLow), label = "Widget resizing outline alpha", ) - val widgetSizeInfo = calculateWidgetSize(item, isResizable) + + val widgetSizeInfo = + calculateWidgetSize( + cellHeight = sizeInfo?.cellSize?.height, + availableHeight = sizeInfo?.availableHeight, + item = item, + isResizable = isResizable, + ) ResizableItemFrameWrapper( key = item.key, - currentSpan = GridItemSpan(item.size.span), + currentSpan = GridItemSpan(currentItemSpan), gridState = gridState, gridContentPadding = contentPadding, - verticalArrangement = itemArrangement, + verticalArrangement = + Arrangement.spacedBy( + sizeInfo?.verticalArrangement ?: Dimensions.ItemSpacing + ), enabled = selected, alpha = { outlineAlpha }, modifier = @@ -908,7 +967,7 @@ private fun EmptyStateCta(contentPadding: PaddingValues, viewModel: BaseCommunal text = titleForEmptyStateCTA, style = MaterialTheme.typography.displaySmall, textAlign = TextAlign.Center, - color = colors.secondary, + color = colors.primary, modifier = Modifier.focusable().semantics(mergeDescendants = true) { contentDescription = titleForEmptyStateCTA @@ -1686,11 +1745,11 @@ private fun beforeContentPadding(paddingValues: PaddingValues): ContentPaddingIn } } -private fun CommunalContentSize.dp(): Dp { +private fun CommunalContentSize.FixedSize.dp(): Dp { return when (this) { - CommunalContentSize.FULL -> Dimensions.CardHeightFull - CommunalContentSize.HALF -> Dimensions.CardHeightHalf - CommunalContentSize.THIRD -> Dimensions.CardHeightThird + CommunalContentSize.FixedSize.FULL -> Dimensions.CardHeightFull + CommunalContentSize.FixedSize.HALF -> Dimensions.CardHeightHalf + CommunalContentSize.FixedSize.THIRD -> Dimensions.CardHeightThird } } @@ -1709,7 +1768,10 @@ class Dimensions(val context: Context, val config: Configuration) { val GridTopSpacing: Dp get() { val result = - if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) { + if ( + communalResponsiveGrid() || + config.orientation == Configuration.ORIENTATION_LANDSCAPE + ) { 114.dp } else { val windowMetrics = @@ -1729,7 +1791,7 @@ class Dimensions(val context: Context, val config: Configuration) { get() = 530.adjustedDp val ItemSpacing - get() = 50.adjustedDp + get() = if (communalResponsiveGrid()) 32.adjustedDp else 50.adjustedDp val CardHeightHalf get() = (CardHeightFull - ItemSpacing) / 2 @@ -1771,6 +1833,13 @@ class Dimensions(val context: Context, val config: Configuration) { data class WidgetSizeInfo(val minHeightPx: Int, val maxHeightPx: Int) +private fun CommunalContentModel.getSpanOrMax(maxSpan: Int?) = + if (maxSpan != null) { + size.span.coerceAtMost(maxSpan) + } else { + size.span + } + private object Colors { val DisabledColorFilter by lazy { disabledColorMatrix() } diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ResponsiveLazyHorizontalGrid.kt b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ResponsiveLazyHorizontalGrid.kt index e3310780afd7..3642127d0823 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ResponsiveLazyHorizontalGrid.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/ResponsiveLazyHorizontalGrid.kt @@ -147,9 +147,9 @@ fun ResponsiveLazyHorizontalGrid( SizeInfo( cellSize = finalSize, contentPadding = finalContentPadding, - horizontalArrangement = minHorizontalArrangement, verticalArrangement = minVerticalArrangement, maxHeight = maxHeight, + gridSize = gridSize, ) ) } @@ -176,16 +176,15 @@ private fun calculateClosestSize(maxWidth: Dp, maxHeight: Dp, aspectRatio: Float * Provides size info of the responsive grid, since the size is dynamic. * * @property cellSize The size of each cell in the grid. - * @property contentPadding The final content padding of the grid. - * @property horizontalArrangement The space between columns in the grid. * @property verticalArrangement The space between rows in the grid. + * @property gridSize The size of the grid, in cell units. * @property availableHeight The maximum height an item in the grid may occupy. */ data class SizeInfo( val cellSize: DpSize, - val contentPadding: PaddingValues, - val horizontalArrangement: Dp, val verticalArrangement: Dp, + val gridSize: IntSize, + private val contentPadding: PaddingValues, private val maxHeight: Dp, ) { val availableHeight: Dp @@ -193,6 +192,11 @@ data class SizeInfo( maxHeight - contentPadding.calculateBottomPadding() - contentPadding.calculateTopPadding() + + /** Calculates the height in dp of a certain number of rows. */ + fun calculateHeight(numRows: Int): Dp { + return numRows * cellSize.height + (numRows - 1) * verticalArrangement + } } @Composable diff --git a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/AlternateBouncer.kt b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/AlternateBouncer.kt index 1475795e2dc6..d02215083679 100644 --- a/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/AlternateBouncer.kt +++ b/packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/AlternateBouncer.kt @@ -18,6 +18,7 @@ package com.android.systemui.keyguard.ui.composable import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.Crossfade +import androidx.compose.animation.core.MutableTransitionState import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut @@ -29,7 +30,9 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color @@ -60,13 +63,25 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi @Composable fun AlternateBouncer( alternateBouncerDependencies: AlternateBouncerDependencies, + onHideAnimationFinished: () -> Unit, modifier: Modifier = Modifier, ) { val isVisible by - alternateBouncerDependencies.viewModel.isVisible.collectAsStateWithLifecycle( - initialValue = false - ) + alternateBouncerDependencies.viewModel.isVisible.collectAsStateWithLifecycle(true) + val visibleState = remember { MutableTransitionState(isVisible) } + + // Feeds the isVisible value to the MutableTransitionState used by AnimatedVisibility below. + LaunchedEffect(isVisible) { visibleState.targetState = isVisible } + + // Watches the MutableTransitionState and calls onHideAnimationFinished when the fade out + // animation is finished. This way the window view is removed from the view hierarchy only after + // the fade out animation is complete. + LaunchedEffect(visibleState.currentState, visibleState.isIdle) { + if (!visibleState.currentState && visibleState.isIdle) { + onHideAnimationFinished() + } + } val udfpsIconLocation by alternateBouncerDependencies.udfpsIconViewModel.iconLocation.collectAsStateWithLifecycle( @@ -74,7 +89,7 @@ fun AlternateBouncer( ) AnimatedVisibility( - visible = isVisible, + visibleState = visibleState, enter = fadeIn(), exit = fadeOut(), modifier = modifier, diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt index 7a8d20a7b85d..caf5e41576f3 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/DraggableHandler.kt @@ -124,7 +124,7 @@ internal class DraggableHandlerImpl( return newDragController } - internal fun createSwipeAnimation(swipes: Swipes, result: UserActionResult): SwipeAnimation<*> { + private fun createSwipeAnimation(swipes: Swipes, result: UserActionResult): SwipeAnimation<*> { val upOrLeftResult = swipes.upOrLeftResult val downOrRightResult = swipes.downOrRightResult val isUpOrLeft = @@ -248,38 +248,8 @@ private class DragControllerImpl( else -> desiredOffset.fastCoerceIn(distance, 0f) } - val consumedDelta = newOffset - previousOffset - swipeAnimation.dragOffset = newOffset - val result = swipes.findUserActionResult(directionOffset = newOffset) - - if (result == null) { - onCancel(canChangeContent = true) - return 0f - } - - val currentTransitionIrreversible = - if (swipeAnimation.isUpOrLeft) { - swipes.upOrLeftResult?.isIrreversible ?: false - } else { - swipes.downOrRightResult?.isIrreversible ?: false - } - - val needNewTransition = - !currentTransitionIrreversible && - (result.toContent(layoutState.currentScene) != swipeAnimation.toContent || - result.transitionKey != swipeAnimation.contentTransition.key) - - if (needNewTransition) { - // Make sure the current transition will finish to the right current scene. - swipeAnimation.currentContent = swipeAnimation.fromContent - - val newSwipeAnimation = draggableHandler.createSwipeAnimation(swipes, result) - newSwipeAnimation.dragOffset = newOffset - updateTransition(newSwipeAnimation) - } - - return consumedDelta + return newOffset - previousOffset } override suspend fun onStop(velocity: Float, canChangeContent: Boolean): Float { diff --git a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt index 759100b15a56..a14b2b3746f5 100644 --- a/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt +++ b/packages/SystemUI/compose/scene/src/com/android/compose/animation/scene/SceneTransitionLayout.kt @@ -554,12 +554,6 @@ sealed class UserActionResult( * bigger than 100% when the user released their finger. ` */ open val requiresFullDistanceSwipe: Boolean, - - /** - * Whether swiping back in the opposite direction past the origin point of the swipe can replace - * the action with the action for the opposite direction. - */ - open val isIrreversible: Boolean = false, ) { internal abstract fun toContent(currentScene: SceneKey): ContentKey @@ -569,7 +563,6 @@ sealed class UserActionResult( val toScene: SceneKey, override val transitionKey: TransitionKey? = null, override val requiresFullDistanceSwipe: Boolean = false, - override val isIrreversible: Boolean = false, ) : UserActionResult(transitionKey, requiresFullDistanceSwipe) { override fun toContent(currentScene: SceneKey): ContentKey = toScene } @@ -579,7 +572,6 @@ sealed class UserActionResult( val overlay: OverlayKey, override val transitionKey: TransitionKey? = null, override val requiresFullDistanceSwipe: Boolean = false, - override val isIrreversible: Boolean = false, ) : UserActionResult(transitionKey, requiresFullDistanceSwipe) { override fun toContent(currentScene: SceneKey): ContentKey = overlay } @@ -622,14 +614,7 @@ sealed class UserActionResult( * the user released their finger. */ requiresFullDistanceSwipe: Boolean = false, - - /** - * Whether swiping back in the opposite direction past the origin point of the swipe can - * replace the action with the action for the opposite direction. - */ - isIrreversible: Boolean = false, - ): UserActionResult = - ChangeScene(toScene, transitionKey, requiresFullDistanceSwipe, isIrreversible) + ): UserActionResult = ChangeScene(toScene, transitionKey, requiresFullDistanceSwipe) /** A [UserActionResult] that shows [toOverlay]. */ operator fun invoke( diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt index 394568d34fa2..2c8dc3264b7e 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/DraggableHandlerTest.kt @@ -418,37 +418,6 @@ class DraggableHandlerTest { } @Test - fun onDragReversedDirection_changeToScene() = runGestureTest { - // Drag A -> B with progress 0.6 - val dragController = onDragStarted(overSlop = -60f) - assertTransition( - currentScene = SceneA, - fromScene = SceneA, - toScene = SceneB, - progress = 0.6f, - ) - - // Reverse direction such that A -> C now with 0.4 - dragController.onDragDelta(pixels = 100f) - assertTransition( - currentScene = SceneA, - fromScene = SceneA, - toScene = SceneC, - progress = 0.4f, - ) - - // After the drag stopped scene C should be committed - dragController.onDragStoppedAnimateNow( - velocity = velocityThreshold, - onAnimationStart = { - assertTransition(currentScene = SceneC, fromScene = SceneA, toScene = SceneC) - }, - expectedConsumedVelocity = velocityThreshold, - ) - assertIdle(currentScene = SceneC) - } - - @Test fun onDragStartedWithoutActionsInBothDirections_stayIdle() = runGestureTest { onDragStarted( horizontalDraggableHandler, @@ -498,31 +467,9 @@ class DraggableHandlerTest { } @Test - fun onDragWithActionsInBothDirections_dragToOppositeDirectionReplacesAction() = runGestureTest { - // We are on SceneA. UP -> B, DOWN-> C. - val dragController = onDragStarted(overSlop = up(fractionOfScreen = 0.2f)) - assertTransition( - currentScene = SceneA, - fromScene = SceneA, - toScene = SceneB, - progress = 0.2f, - ) - - // Reverse drag direction, it will replace the previous transition - dragController.onDragDelta(pixels = down(fractionOfScreen = 0.5f)) - assertTransition( - currentScene = SceneA, - fromScene = SceneA, - toScene = SceneC, - progress = 0.3f, - ) - } - - @Test fun onDragWithActionsInBothDirections_dragToOppositeDirectionNotReplaceable() = runGestureTest { // We are on SceneA. UP -> B, DOWN-> C. The up swipe is not replaceable though. - mutableUserActionsA = - mapOf(Swipe.Up to UserActionResult(SceneB, isIrreversible = true), Swipe.Down to SceneC) + mutableUserActionsA = mapOf(Swipe.Up to UserActionResult(SceneB), Swipe.Down to SceneC) val dragController = onDragStarted( pointersInfo = @@ -536,7 +483,7 @@ class DraggableHandlerTest { progress = 0.2f, ) - // Reverse drag direction, it cannot replace the previous transition + // Reverse drag direction, it does not replace the previous transition. dragController.onDragDelta(pixels = down(fractionOfScreen = 0.5f)) assertTransition( currentScene = SceneA, diff --git a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt index b3a3261122a8..fe7b5b6bf4da 100644 --- a/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt +++ b/packages/SystemUI/compose/scene/tests/src/com/android/compose/animation/scene/SwipeToSceneTest.kt @@ -664,17 +664,11 @@ class SwipeToSceneTest { } } - // Swipe down for the default transition from A to B. + // Move the pointer up to swipe to scene B using the new transition. rule.onRoot().performTouchInput { - down(middle) - moveBy(Offset(0f, touchSlop), delayMillis = 1_000) + down(center) + moveBy(Offset(0f, -touchSlop - 1.dp.toPx()), delayMillis = 1_000) } - - assertThat(state.isTransitioning(from = SceneA, to = SceneB)).isTrue() - assertThat(state.currentTransition?.transformationSpec?.transformationMatchers).hasSize(1) - - // Move the pointer up to swipe to scene B using the new transition. - rule.onRoot().performTouchInput { moveBy(Offset(0f, -1.dp.toPx()), delayMillis = 1_000) } assertThat(state.isTransitioning(from = SceneA, to = SceneB)).isTrue() assertThat(state.currentTransition?.transformationSpec?.transformationMatchers).hasSize(2) } diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockDesign.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockDesign.kt index bcf055bd2c40..15373d354ef6 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockDesign.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/ClockDesign.kt @@ -33,7 +33,7 @@ data class ClockDesign( val thumbnail: String? = null, val large: ClockFace? = null, val small: ClockFace? = null, - val colorPalette: MonetStyle? = null, + @MonetStyle.Type val colorPalette: Int? = null, ) /** Describes a clock using layers */ diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt index 300a3e204582..ad9eba841c86 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/DefaultClockController.kt @@ -106,10 +106,8 @@ class DefaultClockController( largeClock.animations = LargeClockAnimations(largeClock.view, dozeFraction, foldFraction) smallClock.animations = DefaultClockAnimations(smallClock.view, dozeFraction, foldFraction) - val theme = ThemeConfig(isDarkTheme, settings?.seedColor) - largeClock.events.onThemeChanged(theme) - smallClock.events.onThemeChanged(theme) - + largeClock.events.onThemeChanged(largeClock.theme.copy(isDarkTheme = isDarkTheme)) + smallClock.events.onThemeChanged(smallClock.theme.copy(isDarkTheme = isDarkTheme)) events.onTimeZoneChanged(TimeZone.getDefault()) smallClock.events.onTimeTick() diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt index c7a3f63e92e7..7f01fd7c87ac 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockController.kt @@ -24,7 +24,6 @@ import com.android.systemui.plugins.clocks.ClockController import com.android.systemui.plugins.clocks.ClockEvents import com.android.systemui.plugins.clocks.ClockFontAxis import com.android.systemui.plugins.clocks.ClockFontAxisSetting -import com.android.systemui.plugins.clocks.ThemeConfig import com.android.systemui.plugins.clocks.WeatherData import com.android.systemui.plugins.clocks.ZenData import com.android.systemui.shared.clocks.view.FlexClockView @@ -107,18 +106,16 @@ class FlexClockController( } override fun initialize(isDarkTheme: Boolean, dozeFraction: Float, foldFraction: Float) { - val theme = ThemeConfig(isDarkTheme, clockCtx.settings.seedColor) events.onFontAxesChanged(clockCtx.settings.axes) - smallClock.run { - events.onThemeChanged(theme) + events.onThemeChanged(theme.copy(isDarkTheme = isDarkTheme)) animations.doze(dozeFraction) animations.fold(foldFraction) events.onTimeTick() } largeClock.run { - events.onThemeChanged(theme) + events.onThemeChanged(theme.copy(isDarkTheme = isDarkTheme)) animations.doze(dozeFraction) animations.fold(foldFraction) events.onTimeTick() diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockFaceController.kt b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockFaceController.kt index a8890e6aa934..21d41ae744a7 100644 --- a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockFaceController.kt +++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/FlexClockFaceController.kt @@ -131,6 +131,7 @@ class FlexClockFaceController( } override fun onThemeChanged(theme: ThemeConfig) { + this@FlexClockFaceController.theme = theme layerController.faceEvents.onThemeChanged(theme) } diff --git a/packages/SystemUI/lint-baseline.xml b/packages/SystemUI/lint-baseline.xml index 7577147a6f16..00b0c44c2077 100644 --- a/packages/SystemUI/lint-baseline.xml +++ b/packages/SystemUI/lint-baseline.xml @@ -32784,4 +32784,984 @@ column="23"/> </issue> + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, val theme: Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/airplane/domain/AirplaneModeMapper.kt" + line="33" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt" + line="39" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @NonNull Context context," + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/AmbientState.java" + line="300" + column="30"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" Context context, DeviceConfigProxy proxy) {" + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/AssistantFeedbackController.java" + line="75" + column="21"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" public AuthController(Context context," + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java" + line="716" + column="35"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated WindowManager, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of WindowManager is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @NonNull WindowManager windowManager," + errorLine2=" ~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java" + line="721" + column="36"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val sysuiContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt" + line="72" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated ConfigurationController, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of ConfigurationController is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val configurationController: ConfigurationController," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/AuthRippleController.kt" + line="74" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main protected val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/battery/ui/BatterySaverTileMapper.kt" + line="32" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" Context context," + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/BiometricNotificationBroadcastReceiver.java" + line="46" + column="21"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main Resources resources," + errorLine2=" ~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/BiometricNotificationDialogFactory.java" + line="52" + column="29"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" public BiometricNotificationService(@NonNull Context context," + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/BiometricNotificationService.java" + line="148" + column="58"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val applicationContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/BouncerActionButtonInteractor.kt" + line="62" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val applicationContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/BouncerRepository.kt" + line="37" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" c: Context," + errorLine2=" ~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ChannelEditorDialogController.kt" + line="61" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/colorcorrection/domain/ColorCorrectionTileMapper.kt" + line="32" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/inversion/domain/ColorInversionTileMapper.kt" + line="33" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val applicationContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/CredentialInteractor.kt" + line="52" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val applicationContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/CredentialViewModel.kt" + line="30" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="class CustomTileStatePersisterImpl @Inject constructor(context: Context) :" + errorLine2=" ~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/external/CustomTileStatePersister.kt" + line="74" + column="56"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/DataSaverTileMapper.kt" + line="32" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/DefaultTilesRepository.kt" + line="18" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/DisplayStateInteractor.kt" + line="77" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/DisplayStateRepository.kt" + line="68" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/EmergencyServicesRepository.kt" + line="38" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/FaceAuthAccessibilityDelegate.kt" + line="37" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/FaceHelpMessageDeferral.kt" + line="42" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application val applicationContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/data/repository/FacePropertyRepository.kt" + line="95" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt" + line="142" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/FingerprintPropertyInteractor.kt" + line="44" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/FlashlightMapper.kt" + line="33" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/FontScalingTileMapper.kt" + line="32" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @NonNull final Context context," + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java" + line="186" + column="36"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated ConfigurationController, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of ConfigurationController is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" ConfigurationController configurationController," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java" + line="192" + column="37"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/hearingdevices/domain/HearingDevicesTileMapper.kt" + line="32" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="class IconBuilder @Inject constructor(private val context: Context) {" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/IconBuilder.kt" + line="27" + column="39"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/irecording/IssueRecordingMapper.kt" + line="31" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated WindowManager, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of WindowManager is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val windowManager: WindowManager," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt" + line="39" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt" + line="40" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt" + line="41" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/location/domain/LocationTileMapper.kt" + line="33" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated LayoutInflater, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of LayoutInflater is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val layoutInflater: LayoutInflater" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt" + line="29" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="class MinimumTilesResourceRepository @Inject constructor(@Main resources: Resources) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/MinimumTilesRepository.kt" + line="38" + column="58"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt" + line="33" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/domain/interactor/NightDisplayTileDataInteractor.kt" + line="38" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/ui/NightDisplayTileMapper.kt" + line="42" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapper.kt" + line="32" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" public NotificationGutsManager(Context context," + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java" + line="137" + column="44"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerAlwaysOnDisplayViewModel.kt" + line="47" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerStatusBarViewModel.kt" + line="53" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(val context: Context) {" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt" + line="27" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated ConfigurationController, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of ConfigurationController is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" ConfigurationController configurationController," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java" + line="737" + column="37"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt" + line="63" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" Builder(@Main Resources resources, ViewConfiguration viewConfiguration," + errorLine2=" ~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java" + line="563" + column="33"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/onehanded/ui/OneHandedModeTileMapper.kt" + line="32" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" public PackageManagerAdapter(Context context) {" + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/external/PackageManagerAdapter.java" + line="45" + column="42"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/PaginatedGridRepository.kt" + line="36" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractor.kt" + line="74" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt" + line="41" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModel.kt" + line="82" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/qr/ui/QRCodeScannerTileMapper.kt" + line="32" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt" + line="36" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" Factory(Context context, QSCustomizerController qsCustomizerController) {" + errorLine2=" ~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/QSTileRevealController.java" + line="99" + column="25"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt" + line="32" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/ui/ReduceBrightColorsTileMapper.kt" + line="33" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/domain/interactor/ReduceBrightColorsTileUserActionInteractor.kt" + line="36" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt" + line="47" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/ui/mapper/RotationLockTileMapper.kt" + line="36" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/pipeline/domain/autoaddable/SafetyCenterAutoAddable.kt" + line="51" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Resources.Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/ui/ScreenRecordTileMapper.kt" + line="33" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated LayoutInflater, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of LayoutInflater is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val layoutInflater: LayoutInflater," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt" + line="43" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" context: Context" + errorLine2=" ~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionHeaderVisibilityProvider.kt" + line="35" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val applicationContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/SideFpsOverlayViewBinder.kt" + line="63" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val applicationContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/ui/viewmodel/SideFpsOverlayViewModel.kt" + line="53" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt" + line="51" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated WindowManager, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of WindowManager is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" windowManager: WindowManager," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/SideFpsSensorInteractor.kt" + line="53" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val applicationContext: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractor.kt" + line="60" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractor.kt" + line="65" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/SimBouncerRepository.kt" + line="91" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(context: Context, val shadeViewController: ShadeViewController) {" + errorLine2=" ~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/shade/StatusBarLongPressGestureDetector.kt" + line="30" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/StockTilesRepository.kt" + line="31" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val context: Context" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolver.kt" + line="33" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/TileSpecRepository.kt" + line="95" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardAccessibilityDelegate.kt" + line="33" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Context, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Context is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Application private val context: Context," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/biometrics/domain/interactor/UdfpsOverlayInteractor.kt" + line="49" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated ConfigurationController, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of ConfigurationController is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" private val configurationController: ConfigurationController," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/interactor/UiModeNightTileDataInteractor.kt" + line="43" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1="constructor(@Main private val resources: Resources, private val theme: Theme) :" + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/UiModeNightTileMapper.kt" + line="37" + column="13"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated Resources, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of Resources is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @Main private val resources: Resources," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/work/ui/WorkModeTileMapper.kt" + line="36" + column="5"/> + </issue> + + <issue + id="ShadeDisplayAwareContextChecker" + message="UI elements of the shade window
should use ShadeDisplayAware-annotated ConfigurationInteractor, as the shade might move between windows, and only
@ShadeDisplayAware resources are updated with the new configuration correctly. Failures to do so
might result in wrong dimensions for shade window classes (e.g. using the wrong density or theme).
If the usage of ConfigurationInteractor is not related to display specific configuration or UI, then there is
technically no need to use the annotation, and you can annotate the class with
@SuppressLint("ShadeDisplayAwareContextChecker")/@Suppress("ShadeDisplayAwareContextChecker")" + errorLine1=" @GlobalConfig configurationInteractor: ConfigurationInteractor," + errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> + <location + file="frameworks/base/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt" + line="43" + column="5"/> + </issue> + + </issues> diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/ExpandHelperTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/ExpandHelperTest.java index 1b072416faa6..7fb879c02778 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/ExpandHelperTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/ExpandHelperTest.java @@ -31,7 +31,7 @@ import androidx.test.filters.SmallTest; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.animation.AnimatorTestRule; -import com.android.systemui.flags.FakeFeatureFlags; +import com.android.systemui.flags.FakeFeatureFlagsClassic; import com.android.systemui.statusbar.NotificationMediaManager; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; import com.android.systemui.statusbar.notification.row.NotificationTestHelper; @@ -49,7 +49,7 @@ public class ExpandHelperTest extends SysuiTestCase { @Rule public final AnimatorTestRule mAnimatorTestRule = new AnimatorTestRule(this); - private final FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags(); + private final FakeFeatureFlagsClassic mFeatureFlags = new FakeFeatureFlagsClassic(); private ExpandableNotificationRow mRow; private ExpandHelper mExpandHelper; private ExpandHelper.Callback mCallback; diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java index 9d471f45a293..ad12c61ab5d1 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegateTest.java @@ -139,13 +139,11 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { private ActivityInfo mActivityInfo; @Mock private Drawable mDrawable; - @Mock - private HearingDevicesPresetsController mPresetsController; + private SystemUIDialog mDialog; private SystemUIDialog.Factory mDialogFactory; private HearingDevicesDialogDelegate mDialogDelegate; private TestableLooper mTestableLooper; - private final List<CachedBluetoothDevice> mDevices = new ArrayList<>(); @Before public void setUp() { @@ -155,7 +153,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { when(mProfileManager.getHapClientProfile()).thenReturn(mHapClientProfile); when(mLocalBluetoothAdapter.isEnabled()).thenReturn(true); when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager); - when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mDevices); + when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(List.of(mCachedDevice)); when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager); when(mSysUiState.setFlag(anyLong(), anyBoolean())).thenReturn(mSysUiState); when(mDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED); @@ -163,6 +161,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { when(mCachedDevice.getDevice()).thenReturn(mDevice); when(mCachedDevice.getAddress()).thenReturn(DEVICE_ADDRESS); when(mCachedDevice.getName()).thenReturn(DEVICE_NAME); + when(mCachedDevice.getProfiles()).thenReturn(List.of(mHapClientProfile)); when(mCachedDevice.isActiveDevice(BluetoothProfile.HEARING_AID)).thenReturn(true); when(mCachedDevice.isConnectedHearingAidDevice()).thenReturn(true); when(mCachedDevice.isConnectedHapClientDevice()).thenReturn(true); @@ -170,12 +169,11 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { when(mHearingDeviceItem.getCachedBluetoothDevice()).thenReturn(mCachedDevice); mContext.setMockPackageManager(mPackageManager); - mDevices.add(mCachedDevice); } @Test public void clickPairNewDeviceButton_intentActionMatch() { - setUpPairNewDeviceDialog(); + setUpDeviceDialogWithPairNewDeviceButton(); mDialog.show(); getPairNewDeviceButton(mDialog).performClick(); @@ -191,7 +189,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { @Test public void onDeviceItemGearClicked_intentActionMatch() { - setUpDeviceListDialog(); + setUpDeviceDialogWithoutPairNewDeviceButton(); mDialogDelegate.onDeviceItemGearClicked(mHearingDeviceItem, new View(mContext)); @@ -206,7 +204,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { @Test public void onDeviceItemOnClicked_connectedDevice_disconnect() { - setUpDeviceListDialog(); + setUpDeviceDialogWithoutPairNewDeviceButton(); when(mHearingDeviceItem.getType()).thenReturn(DeviceItemType.CONNECTED_BLUETOOTH_DEVICE); mDialogDelegate.onDeviceItemClicked(mHearingDeviceItem, new View(mContext)); @@ -222,7 +220,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { mContext.getOrCreateTestableResources().addOverride( R.array.config_quickSettingsHearingDevicesRelatedToolName, new String[]{}); - setUpPairNewDeviceDialog(); + setUpDeviceDialogWithoutPairNewDeviceButton(); mDialog.show(); assertToolsUi(0); @@ -237,7 +235,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { mContext.getOrCreateTestableResources().addOverride( R.array.config_quickSettingsHearingDevicesRelatedToolName, new String[]{}); - setUpPairNewDeviceDialog(); + setUpDeviceDialogWithoutPairNewDeviceButton(); mDialog.show(); assertToolsUi(1); @@ -247,9 +245,8 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { @EnableFlags(Flags.FLAG_HEARING_DEVICES_DIALOG_RELATED_TOOLS) public void showDialog_hasLiveCaption_oneRelatedToolInConfig_showTwoRelatedTools() throws PackageManager.NameNotFoundException { - when(mPackageManager.queryIntentActivities( - eq(LIVE_CAPTION_INTENT), anyInt())).thenReturn( - List.of(new ResolveInfo())); + when(mPackageManager.queryIntentActivities(eq(LIVE_CAPTION_INTENT), anyInt())) + .thenReturn(List.of(new ResolveInfo())); mContext.getOrCreateTestableResources().addOverride( R.array.config_quickSettingsHearingDevicesRelatedToolName, new String[]{TEST_PKG + "/" + TEST_CLS}); @@ -260,18 +257,18 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { when(mActivityInfo.getComponentName()).thenReturn(TEST_COMPONENT); when(mDrawable.mutate()).thenReturn(mDrawable); - setUpPairNewDeviceDialog(); + setUpDeviceDialogWithoutPairNewDeviceButton(); mDialog.show(); assertToolsUi(2); } @Test - public void showDialog_noPreset_presetGone() { - when(mPresetsController.getAllPresetInfo()).thenReturn(new ArrayList<>()); - when(mPresetsController.getActivePresetIndex()).thenReturn(PRESET_INDEX_UNAVAILABLE); + public void showDialog_noPreset_presetLayoutGone() { + when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(new ArrayList<>()); + when(mHapClientProfile.getActivePresetIndex(mDevice)).thenReturn(PRESET_INDEX_UNAVAILABLE); - setUpDeviceListDialog(); + setUpDeviceDialogWithoutPairNewDeviceButton(); mDialog.show(); ViewGroup presetLayout = getPresetLayout(mDialog); @@ -281,11 +278,12 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { @Test public void showDialog_presetExist_presetSelected() { BluetoothHapPresetInfo info = getTestPresetInfo(); - when(mPresetsController.getAllPresetInfo()).thenReturn(List.of(info)); - when(mPresetsController.getActivePresetIndex()).thenReturn(TEST_PRESET_INDEX); + when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(List.of(info)); + when(mHapClientProfile.getActivePresetIndex(mDevice)).thenReturn(TEST_PRESET_INDEX); - setUpDeviceListDialog(); + setUpDeviceDialogWithoutPairNewDeviceButton(); mDialog.show(); + mTestableLooper.processAllMessages(); ViewGroup presetLayout = getPresetLayout(mDialog); assertThat(presetLayout.getVisibility()).isEqualTo(View.VISIBLE); @@ -295,48 +293,32 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { @Test public void onActiveDeviceChanged_presetExist_presetSelected() { - setUpDeviceListDialog(); + setUpDeviceDialogWithoutPairNewDeviceButton(); mDialog.show(); BluetoothHapPresetInfo info = getTestPresetInfo(); - when(mPresetsController.getAllPresetInfo()).thenReturn(List.of(info)); - when(mPresetsController.getActivePresetIndex()).thenReturn(TEST_PRESET_INDEX); + when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(List.of(info)); + when(mHapClientProfile.getActivePresetIndex(mDevice)).thenReturn(TEST_PRESET_INDEX); + + Spinner spinner = getPresetSpinner(mDialog); + assertThat(spinner.getSelectedItemPosition()).isEqualTo(-1); mDialogDelegate.onActiveDeviceChanged(mCachedDevice, BluetoothProfile.LE_AUDIO); mTestableLooper.processAllMessages(); ViewGroup presetLayout = getPresetLayout(mDialog); assertThat(presetLayout.getVisibility()).isEqualTo(View.VISIBLE); - Spinner spinner = getPresetSpinner(mDialog); assertThat(spinner.getSelectedItemPosition()).isEqualTo(0); } + private void setUpDeviceDialogWithPairNewDeviceButton() { + setUpDeviceDialog(/* showPairNewDevice= */ true); + } - - private void setUpPairNewDeviceDialog() { - mDialogFactory = new SystemUIDialog.Factory( - mContext, - mSystemUIDialogManager, - mSysUiState, - getFakeBroadcastDispatcher(), - mDialogTransitionAnimator - ); - mDialogDelegate = new HearingDevicesDialogDelegate( - mContext, - true, - TEST_LAUNCH_SOURCE_ID, - mDialogFactory, - mActivityStarter, - mDialogTransitionAnimator, - mLocalBluetoothManager, - new Handler(mTestableLooper.getLooper()), - mAudioManager, - mUiEventLogger - ); - - mDialog = mDialogDelegate.createDialog(); + private void setUpDeviceDialogWithoutPairNewDeviceButton() { + setUpDeviceDialog(/* showPairNewDevice= */ false); } - private void setUpDeviceListDialog() { + private void setUpDeviceDialog(boolean showPairNewDevice) { mDialogFactory = new SystemUIDialog.Factory( mContext, mSystemUIDialogManager, @@ -345,8 +327,7 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { mDialogTransitionAnimator ); mDialogDelegate = new HearingDevicesDialogDelegate( - mContext, - false, + showPairNewDevice, TEST_LAUNCH_SOURCE_ID, mDialogFactory, mActivityStarter, @@ -356,15 +337,14 @@ public class HearingDevicesDialogDelegateTest extends SysuiTestCase { mAudioManager, mUiEventLogger ); - mDialog = mDialogDelegate.createDialog(); - mDialogDelegate.setHearingDevicesPresetsController(mPresetsController); } private BluetoothHapPresetInfo getTestPresetInfo() { BluetoothHapPresetInfo info = mock(BluetoothHapPresetInfo.class); when(info.getName()).thenReturn(TEST_PRESET_NAME); when(info.getIndex()).thenReturn(TEST_PRESET_INDEX); + when(info.isAvailable()).thenReturn(true); return info; } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesPresetsControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesPresetsControllerTest.java index 2ac5d105ba99..c9779c90c9aa 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesPresetsControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/hearingaid/HearingDevicesPresetsControllerTest.java @@ -21,10 +21,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.kotlin.VerificationKt.never; import static java.util.Collections.emptyList; @@ -39,7 +39,6 @@ import androidx.test.filters.SmallTest; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.HapClientProfile; -import com.android.settingslib.bluetooth.LocalBluetoothProfile; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import com.android.systemui.SysuiTestCase; @@ -53,6 +52,7 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import java.util.List; +import java.util.Set; import java.util.concurrent.Executor; /** Tests for {@link HearingDevicesPresetsController}. */ @@ -62,6 +62,7 @@ import java.util.concurrent.Executor; public class HearingDevicesPresetsControllerTest extends SysuiTestCase { private static final int TEST_PRESET_INDEX = 1; + private static final int TEST_UPDATED_PRESET_INDEX = 2; private static final String TEST_PRESET_NAME = "test_preset"; private static final int TEST_HAP_GROUP_ID = 1; private static final int TEST_REASON = 1024; @@ -74,14 +75,13 @@ public class HearingDevicesPresetsControllerTest extends SysuiTestCase { @Mock private HapClientProfile mHapClientProfile; @Mock - private CachedBluetoothDevice mCachedBluetoothDevice; + private CachedBluetoothDevice mCachedDevice; @Mock - private CachedBluetoothDevice mSubCachedBluetoothDevice; + private CachedBluetoothDevice mCachedMemberDevice; @Mock - private BluetoothDevice mBluetoothDevice; + private BluetoothDevice mDevice; @Mock - private BluetoothDevice mSubBluetoothDevice; - + private BluetoothDevice mMemberDevice; @Mock private HearingDevicesPresetsController.PresetCallback mCallback; @@ -91,15 +91,19 @@ public class HearingDevicesPresetsControllerTest extends SysuiTestCase { public void setUp() { when(mProfileManager.getHapClientProfile()).thenReturn(mHapClientProfile); when(mHapClientProfile.isProfileReady()).thenReturn(true); - when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice); - when(mCachedBluetoothDevice.getSubDevice()).thenReturn(mSubCachedBluetoothDevice); - when(mSubCachedBluetoothDevice.getDevice()).thenReturn(mSubBluetoothDevice); + when(mCachedDevice.getDevice()).thenReturn(mDevice); + when(mCachedDevice.getProfiles()).thenReturn(List.of(mHapClientProfile)); + when(mCachedDevice.getMemberDevice()).thenReturn(Set.of(mCachedMemberDevice)); + when(mCachedMemberDevice.getDevice()).thenReturn(mMemberDevice); mController = new HearingDevicesPresetsController(mProfileManager, mCallback); + mController.setDevice(mCachedDevice); } @Test public void onServiceConnected_callExpectedCallback() { + preparePresetInfo(/* isValid= */ true); + mController.onServiceConnected(); verify(mHapClientProfile).registerCallback(any(Executor.class), @@ -108,115 +112,129 @@ public class HearingDevicesPresetsControllerTest extends SysuiTestCase { } @Test - public void getAllPresetInfo_setInvalidHearingDevice_getEmpty() { - when(mCachedBluetoothDevice.getProfiles()).thenReturn(emptyList()); - mController.setHearingDeviceIfSupportHap(mCachedBluetoothDevice); - BluetoothHapPresetInfo hapPresetInfo = getHapPresetInfo(true); - when(mHapClientProfile.getAllPresetInfo(mBluetoothDevice)).thenReturn( - List.of(hapPresetInfo)); + public void setDevice_nonHapDevice_getEmptyListAndInvalidActiveIndex() { + when(mCachedDevice.getProfiles()).thenReturn(emptyList()); + preparePresetInfo(/* isValid= */ true); + + mController.setDevice(mCachedDevice); assertThat(mController.getAllPresetInfo()).isEmpty(); + assertThat(mController.getActivePresetIndex()).isEqualTo( + BluetoothHapClient.PRESET_INDEX_UNAVAILABLE); } @Test - public void getAllPresetInfo_containsNotAvailablePresetInfo_getEmpty() { - setValidHearingDeviceSupportHap(); - BluetoothHapPresetInfo hapPresetInfo = getHapPresetInfo(false); - when(mHapClientProfile.getAllPresetInfo(mBluetoothDevice)).thenReturn( - List.of(hapPresetInfo)); + public void refreshPresetInfo_containsOnlyNotAvailablePresetInfo_getEmptyList() { + preparePresetInfo(/* isValid= */ false); + + mController.refreshPresetInfo(); assertThat(mController.getAllPresetInfo()).isEmpty(); } @Test - public void getAllPresetInfo_containsOnePresetInfo_getOnePresetInfo() { - setValidHearingDeviceSupportHap(); - BluetoothHapPresetInfo hapPresetInfo = getHapPresetInfo(true); - when(mHapClientProfile.getAllPresetInfo(mBluetoothDevice)).thenReturn( - List.of(hapPresetInfo)); + public void refreshPresetInfo_containsOnePresetInfo_getOnePresetInfo() { + List<BluetoothHapPresetInfo> infos = preparePresetInfo(/* isValid= */ true); - assertThat(mController.getAllPresetInfo()).contains(hapPresetInfo); + mController.refreshPresetInfo(); + + List<BluetoothHapPresetInfo> presetInfos = mController.getAllPresetInfo(); + assertThat(presetInfos.size()).isEqualTo(1); + assertThat(presetInfos).contains(infos.getFirst()); } @Test - public void getActivePresetIndex_getExpectedIndex() { - setValidHearingDeviceSupportHap(); - when(mHapClientProfile.getActivePresetIndex(mBluetoothDevice)).thenReturn( - TEST_PRESET_INDEX); + public void refreshPresetInfo_getExpectedIndex() { + preparePresetInfo(/* isValid= */ true); + + mController.refreshPresetInfo(); assertThat(mController.getActivePresetIndex()).isEqualTo(TEST_PRESET_INDEX); } @Test - public void onPresetSelected_presetIndex_callOnPresetInfoUpdatedWithExpectedPresetIndex() { - setValidHearingDeviceSupportHap(); - BluetoothHapPresetInfo hapPresetInfo = getHapPresetInfo(true); - when(mHapClientProfile.getAllPresetInfo(mBluetoothDevice)).thenReturn( - List.of(hapPresetInfo)); - when(mHapClientProfile.getActivePresetIndex(mBluetoothDevice)).thenReturn( - TEST_PRESET_INDEX); + public void refreshPresetInfo_callbackIsCalledWhenNeeded() { + List<BluetoothHapPresetInfo> infos = preparePresetInfo(/* isValid= */ true); + + mController.refreshPresetInfo(); + + verify(mCallback).onPresetInfoUpdated(infos, TEST_PRESET_INDEX); + + Mockito.reset(mCallback); + mController.refreshPresetInfo(); + + verify(mCallback, never()).onPresetInfoUpdated(anyList(), anyInt()); + + Mockito.reset(mCallback); + when(mHapClientProfile.getActivePresetIndex(mDevice)).thenReturn(TEST_UPDATED_PRESET_INDEX); + mController.refreshPresetInfo(); + + verify(mCallback).onPresetInfoUpdated(infos, TEST_UPDATED_PRESET_INDEX); + } + + @Test + public void onPresetSelected_callOnPresetInfoUpdatedWithExpectedPresetIndex() { + List<BluetoothHapPresetInfo> infos = preparePresetInfo(/* isValid= */ true); - mController.onPresetSelected(mBluetoothDevice, TEST_PRESET_INDEX, TEST_REASON); + mController.onPresetSelected(mDevice, TEST_PRESET_INDEX, TEST_REASON); - verify(mCallback).onPresetInfoUpdated(eq(List.of(hapPresetInfo)), eq(TEST_PRESET_INDEX)); + verify(mCallback).onPresetInfoUpdated(infos, TEST_PRESET_INDEX); } @Test - public void onPresetInfoChanged_presetIndex_callOnPresetInfoUpdatedWithExpectedPresetIndex() { - setValidHearingDeviceSupportHap(); - BluetoothHapPresetInfo hapPresetInfo = getHapPresetInfo(true); - when(mHapClientProfile.getAllPresetInfo(mBluetoothDevice)).thenReturn( - List.of(hapPresetInfo)); - when(mHapClientProfile.getActivePresetIndex(mBluetoothDevice)).thenReturn( - TEST_PRESET_INDEX); + public void onPresetInfoChanged_callOnPresetInfoUpdatedWithExpectedPresetIndex() { + List<BluetoothHapPresetInfo> infos = preparePresetInfo(/* isValid= */ true); - mController.onPresetInfoChanged(mBluetoothDevice, List.of(hapPresetInfo), TEST_REASON); + mController.onPresetInfoChanged(mDevice, infos, TEST_REASON); - verify(mCallback).onPresetInfoUpdated(List.of(hapPresetInfo), TEST_PRESET_INDEX); + verify(mCallback).onPresetInfoUpdated(infos, TEST_PRESET_INDEX); } @Test public void onPresetSelectionFailed_callOnPresetCommandFailed() { - setValidHearingDeviceSupportHap(); - - mController.onPresetSelectionFailed(mBluetoothDevice, TEST_REASON); + mController.onPresetSelectionFailed(mDevice, TEST_REASON); verify(mCallback).onPresetCommandFailed(TEST_REASON); } @Test public void onSetPresetNameFailed_callOnPresetCommandFailed() { - setValidHearingDeviceSupportHap(); - - mController.onSetPresetNameFailed(mBluetoothDevice, TEST_REASON); + mController.onSetPresetNameFailed(mDevice, TEST_REASON); verify(mCallback).onPresetCommandFailed(TEST_REASON); } @Test - public void onPresetSelectionForGroupFailed_callSelectPresetIndividual() { - setValidHearingDeviceSupportHap(); + public void onPresetSelectionForGroupFailed_callSelectPresetIndependently() { mController.selectPreset(TEST_PRESET_INDEX); Mockito.reset(mHapClientProfile); - when(mHapClientProfile.getHapGroup(mBluetoothDevice)).thenReturn(TEST_HAP_GROUP_ID); + when(mHapClientProfile.getHapGroup(mDevice)).thenReturn(TEST_HAP_GROUP_ID); mController.onPresetSelectionForGroupFailed(TEST_HAP_GROUP_ID, TEST_REASON); - - verify(mHapClientProfile).selectPreset(mBluetoothDevice, TEST_PRESET_INDEX); - verify(mHapClientProfile).selectPreset(mSubBluetoothDevice, TEST_PRESET_INDEX); + verify(mHapClientProfile).selectPreset(mDevice, TEST_PRESET_INDEX); + verify(mHapClientProfile).selectPreset(mMemberDevice, TEST_PRESET_INDEX); } @Test public void onSetPresetNameForGroupFailed_callOnPresetCommandFailed() { - setValidHearingDeviceSupportHap(); - mController.onSetPresetNameForGroupFailed(TEST_HAP_GROUP_ID, TEST_REASON); verify(mCallback).onPresetCommandFailed(TEST_REASON); } @Test + public void registerHapCallback_profileNotReady_addServiceListener() { + when(mHapClientProfile.isProfileReady()).thenReturn(false); + + mController.registerHapCallback(); + + verify(mProfileManager).addServiceListener(mController); + verify(mHapClientProfile, never()).registerCallback(any(Executor.class), + any(BluetoothHapClient.Callback.class)); + } + + @Test public void registerHapCallback_callHapRegisterCallback() { mController.registerHapCallback(); @@ -233,9 +251,8 @@ public class HearingDevicesPresetsControllerTest extends SysuiTestCase { @Test public void selectPreset_supportSynchronized_validGroupId_callSelectPresetForGroup() { - setValidHearingDeviceSupportHap(); - when(mHapClientProfile.supportsSynchronizedPresets(mBluetoothDevice)).thenReturn(true); - when(mHapClientProfile.getHapGroup(mBluetoothDevice)).thenReturn(TEST_HAP_GROUP_ID); + when(mHapClientProfile.supportsSynchronizedPresets(mDevice)).thenReturn(true); + when(mHapClientProfile.getHapGroup(mDevice)).thenReturn(TEST_HAP_GROUP_ID); mController.selectPreset(TEST_PRESET_INDEX); @@ -243,28 +260,34 @@ public class HearingDevicesPresetsControllerTest extends SysuiTestCase { } @Test - public void selectPreset_supportSynchronized_invalidGroupId_callSelectPresetIndividual() { - setValidHearingDeviceSupportHap(); - when(mHapClientProfile.supportsSynchronizedPresets(mBluetoothDevice)).thenReturn(true); - when(mHapClientProfile.getHapGroup(mBluetoothDevice)).thenReturn( + public void selectPreset_supportSynchronized_invalidGroupId_callSelectPresetIndependently() { + when(mHapClientProfile.supportsSynchronizedPresets(mDevice)).thenReturn(true); + when(mHapClientProfile.getHapGroup(mDevice)).thenReturn( BluetoothCsipSetCoordinator.GROUP_ID_INVALID); mController.selectPreset(TEST_PRESET_INDEX); - verify(mHapClientProfile).selectPreset(mBluetoothDevice, TEST_PRESET_INDEX); - verify(mHapClientProfile).selectPreset(mSubBluetoothDevice, TEST_PRESET_INDEX); + verify(mHapClientProfile).selectPreset(mDevice, TEST_PRESET_INDEX); + verify(mHapClientProfile).selectPreset(mMemberDevice, TEST_PRESET_INDEX); } @Test - public void selectPreset_notSupportSynchronized_validGroupId_callSelectPresetIndividual() { - setValidHearingDeviceSupportHap(); - when(mHapClientProfile.supportsSynchronizedPresets(mBluetoothDevice)).thenReturn(false); - when(mHapClientProfile.getHapGroup(mBluetoothDevice)).thenReturn(TEST_HAP_GROUP_ID); + public void selectPreset_notSupportSynchronized_validGroupId_callSelectPresetIndependently() { + when(mHapClientProfile.supportsSynchronizedPresets(mDevice)).thenReturn(false); + when(mHapClientProfile.getHapGroup(mDevice)).thenReturn(TEST_HAP_GROUP_ID); mController.selectPreset(TEST_PRESET_INDEX); - verify(mHapClientProfile).selectPreset(mBluetoothDevice, TEST_PRESET_INDEX); - verify(mHapClientProfile).selectPreset(mSubBluetoothDevice, TEST_PRESET_INDEX); + verify(mHapClientProfile).selectPreset(mDevice, TEST_PRESET_INDEX); + verify(mHapClientProfile).selectPreset(mMemberDevice, TEST_PRESET_INDEX); + } + + private List<BluetoothHapPresetInfo> preparePresetInfo(boolean isValid) { + BluetoothHapPresetInfo info = getHapPresetInfo(isValid); + List<BluetoothHapPresetInfo> infos = List.of(info); + when(mHapClientProfile.getAllPresetInfo(mDevice)).thenReturn(infos); + when(mHapClientProfile.getActivePresetIndex(mDevice)).thenReturn(TEST_PRESET_INDEX); + return infos; } private BluetoothHapPresetInfo getHapPresetInfo(boolean available) { @@ -274,12 +297,4 @@ public class HearingDevicesPresetsControllerTest extends SysuiTestCase { when(info.isAvailable()).thenReturn(available); return info; } - - private void setValidHearingDeviceSupportHap() { - LocalBluetoothProfile hapClientProfile = mock(HapClientProfile.class); - List<LocalBluetoothProfile> profiles = List.of(hapClientProfile); - when(mCachedBluetoothDevice.getProfiles()).thenReturn(profiles); - - mController.setHearingDeviceIfSupportHap(mCachedBluetoothDevice); - } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java index 2817f5573865..acc97a9f8642 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/AuthControllerTest.java @@ -43,6 +43,7 @@ import static org.mockito.Mockito.when; import android.app.ActivityManager; import android.app.ActivityTaskManager; +import android.app.KeyguardManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -182,6 +183,8 @@ public class AuthControllerTest extends SysuiTestCase { @Captor private ArgumentCaptor<IFaceAuthenticatorsRegisteredCallback> mFaceAuthenticatorsRegisteredCaptor; @Captor + private ArgumentCaptor<KeyguardManager.KeyguardLockedStateListener> mKeyguardLockedStateCaptor; + @Captor private ArgumentCaptor<BiometricStateListener> mBiometricStateCaptor; @Captor private ArgumentCaptor<Integer> mModalityCaptor; @@ -192,6 +195,8 @@ public class AuthControllerTest extends SysuiTestCase { @Mock private VibratorHelper mVibratorHelper; @Mock + private KeyguardManager mKeyguardManager; + @Mock private MSDLPlayer mMSDLPlayer; private TestableContext mContextSpy; @@ -272,6 +277,9 @@ public class AuthControllerTest extends SysuiTestCase { mFpAuthenticatorsRegisteredCaptor.getValue().onAllAuthenticatorsRegistered(fpProps); mFaceAuthenticatorsRegisteredCaptor.getValue().onAllAuthenticatorsRegistered(faceProps); + verify(mKeyguardManager).addKeyguardLockedStateListener(any(), + mKeyguardLockedStateCaptor.capture()); + // Ensures that the operations posted on the handler get executed. waitForIdleSync(); } @@ -977,6 +985,18 @@ public class AuthControllerTest extends SysuiTestCase { } @Test + public void testCloseDialog_whenDeviceLocks() throws Exception { + showDialog(new int[]{1} /* sensorIds */, false /* credentialAllowed */); + + mKeyguardLockedStateCaptor.getValue().onKeyguardLockedStateChanged( + true /* isKeyguardLocked */); + + verify(mReceiver).onDialogDismissed( + eq(BiometricPrompt.DISMISSED_REASON_USER_CANCEL), + eq(null) /* credentialAttestation */); + } + + @Test public void testShowDialog_whenOwnerNotInForeground() { PromptInfo promptInfo = createTestPromptInfo(); promptInfo.setAllowBackgroundAuthentication(false); @@ -1193,7 +1213,7 @@ public class AuthControllerTest extends SysuiTestCase { mWakefulnessLifecycle, mUserManager, mLockPatternUtils, () -> mUdfpsLogger, () -> mLogContextInteractor, () -> mPromptSelectionInteractor, () -> mCredentialViewModel, () -> mPromptViewModel, mInteractionJankMonitor, - mHandler, mBackgroundExecutor, mUdfpsUtils, mVibratorHelper, + mHandler, mBackgroundExecutor, mUdfpsUtils, mVibratorHelper, mKeyguardManager, mLazyViewCapture, mMSDLPlayer); } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt index 596db0767867..f1c58a2aeac9 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/db/DefaultWidgetPopulationTest.kt @@ -24,6 +24,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.communal.data.db.DefaultWidgetPopulation.SkipReason.RESTORED_FROM_BACKUP +import com.android.systemui.communal.shared.model.SpanValue import com.android.systemui.communal.widgets.CommunalWidgetHost import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.kosmos.testScope @@ -117,7 +118,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() { componentName = defaultWidgets[0], rank = 0, userSerialNumber = 0, - spanY = 3, + spanY = SpanValue.Fixed(3), ) verify(communalWidgetDao) .addWidget( @@ -125,7 +126,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() { componentName = defaultWidgets[1], rank = 1, userSerialNumber = 0, - spanY = 3, + spanY = SpanValue.Fixed(3), ) verify(communalWidgetDao) .addWidget( @@ -133,7 +134,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() { componentName = defaultWidgets[2], rank = 2, userSerialNumber = 0, - spanY = 3, + spanY = SpanValue.Fixed(3), ) } @@ -155,7 +156,7 @@ class DefaultWidgetPopulationTest : SysuiTestCase() { componentName = any(), rank = anyInt(), userSerialNumber = anyInt(), - spanY = anyInt(), + spanY = any(), ) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryLocalImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryLocalImplTest.kt index 55d7d08e8519..335e39902983 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryLocalImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryLocalImplTest.kt @@ -24,11 +24,15 @@ import android.content.ComponentName import android.content.applicationContext import android.graphics.Bitmap import android.os.UserHandle +import android.os.UserManager import android.os.userManager +import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags -import androidx.test.ext.junit.runners.AndroidJUnit4 +import android.platform.test.flag.junit.FlagsParameterization import androidx.test.filters.SmallTest +import com.android.systemui.Flags.FLAG_COMMUNAL_RESPONSIVE_GRID import com.android.systemui.Flags.FLAG_COMMUNAL_WIDGET_RESIZING +import com.android.systemui.Flags.communalResponsiveGrid import com.android.systemui.SysuiTestCase import com.android.systemui.common.data.repository.fakePackageChangeRepository import com.android.systemui.common.shared.model.PackageInstallSession @@ -40,11 +44,15 @@ import com.android.systemui.communal.data.db.defaultWidgetPopulation import com.android.systemui.communal.nano.CommunalHubState import com.android.systemui.communal.proto.toByteArray import com.android.systemui.communal.shared.model.CommunalWidgetContentModel +import com.android.systemui.communal.shared.model.SpanValue import com.android.systemui.communal.widgets.CommunalAppWidgetHost import com.android.systemui.communal.widgets.CommunalWidgetHost import com.android.systemui.communal.widgets.widgetConfiguratorFail import com.android.systemui.communal.widgets.widgetConfiguratorSuccess -import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.collectLastValue +import com.android.systemui.kosmos.runCurrent +import com.android.systemui.kosmos.runTest import com.android.systemui.kosmos.testDispatcher import com.android.systemui.kosmos.testScope import com.android.systemui.log.LogBuffer @@ -52,48 +60,55 @@ import com.android.systemui.log.logcatLogBuffer import com.android.systemui.res.R import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.test.runCurrent -import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentMatchers.anyInt -import org.mockito.Mock import org.mockito.Mockito.eq import org.mockito.Mockito.never import org.mockito.Mockito.verify -import org.mockito.MockitoAnnotations import org.mockito.kotlin.any import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock import org.mockito.kotlin.whenever +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters -@OptIn(ExperimentalCoroutinesApi::class) @SmallTest -@RunWith(AndroidJUnit4::class) -class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { - @Mock private lateinit var appWidgetHost: CommunalAppWidgetHost - @Mock private lateinit var providerInfoA: AppWidgetProviderInfo - @Mock private lateinit var providerInfoB: AppWidgetProviderInfo - @Mock private lateinit var providerInfoC: AppWidgetProviderInfo - @Mock private lateinit var communalWidgetHost: CommunalWidgetHost - @Mock private lateinit var communalWidgetDao: CommunalWidgetDao - @Mock private lateinit var backupManager: BackupManager +@RunWith(ParameterizedAndroidJunit4::class) +class CommunalWidgetRepositoryLocalImplTest(flags: FlagsParameterization) : SysuiTestCase() { + private val kosmos = testKosmos() + + private val appWidgetHost = mock<CommunalAppWidgetHost>() + private val providerInfoA = mock<AppWidgetProviderInfo>() + private val providerInfoB = mock<AppWidgetProviderInfo>() + private val providerInfoC = mock<AppWidgetProviderInfo>() private val communalHubStateCaptor = argumentCaptor<CommunalHubState>() private val componentNameCaptor = argumentCaptor<ComponentName>() - private lateinit var backupUtils: CommunalBackupUtils - private lateinit var logBuffer: LogBuffer - private lateinit var fakeWidgets: MutableStateFlow<Map<CommunalItemRank, CommunalWidgetItem>> - private lateinit var fakeProviders: MutableStateFlow<Map<Int, AppWidgetProviderInfo?>> + private val Kosmos.communalWidgetHost by + Kosmos.Fixture { + mock<CommunalWidgetHost> { on { appWidgetProviders } doReturn fakeProviders } + } + private val Kosmos.communalWidgetDao by + Kosmos.Fixture { mock<CommunalWidgetDao> { on { getWidgets() } doReturn fakeWidgets } } + + private val Kosmos.backupManager by Kosmos.Fixture { mock<BackupManager>() } - private val kosmos = testKosmos() - private val testScope = kosmos.testScope - private val packageChangeRepository = kosmos.fakePackageChangeRepository - private val userManager = kosmos.userManager + private val Kosmos.backupUtils: CommunalBackupUtils by + Kosmos.Fixture { CommunalBackupUtils(applicationContext) } + + private val Kosmos.logBuffer: LogBuffer by + Kosmos.Fixture { logcatLogBuffer(name = "CommunalWidgetRepoLocalImplTest") } + + private val Kosmos.fakeWidgets: MutableStateFlow<Map<CommunalItemRank, CommunalWidgetItem>> by + Kosmos.Fixture { MutableStateFlow(emptyMap()) } + + private val Kosmos.fakeProviders: MutableStateFlow<Map<Int, AppWidgetProviderInfo?>> by + Kosmos.Fixture { MutableStateFlow(emptyMap()) } private val mainUser = UserHandle(0) private val workProfile = UserHandle(10) @@ -105,48 +120,49 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { "com.android.fake/WidgetProviderC", ) - private lateinit var underTest: CommunalWidgetRepositoryLocalImpl - - @Before - fun setUp() { - MockitoAnnotations.initMocks(this) - fakeWidgets = MutableStateFlow(emptyMap()) - fakeProviders = MutableStateFlow(emptyMap()) - logBuffer = logcatLogBuffer(name = "CommunalWidgetRepoLocalImplTest") - backupUtils = CommunalBackupUtils(kosmos.applicationContext) - - setAppWidgetIds(emptyList()) - - overrideResource(R.array.config_communalWidgetAllowlist, fakeAllowlist.toTypedArray()) - - whenever(communalWidgetDao.getWidgets()).thenReturn(fakeWidgets) - whenever(communalWidgetHost.appWidgetProviders).thenReturn(fakeProviders) - whenever(userManager.mainUser).thenReturn(mainUser) - - restoreUser(mainUser) - - underTest = + private val Kosmos.underTest by + Kosmos.Fixture { CommunalWidgetRepositoryLocalImpl( appWidgetHost, testScope.backgroundScope, - kosmos.testDispatcher, + testDispatcher, communalWidgetHost, communalWidgetDao, logBuffer, backupManager, backupUtils, - packageChangeRepository, + fakePackageChangeRepository, userManager, - kosmos.defaultWidgetPopulation, + defaultWidgetPopulation, ) + } + + init { + mSetFlagsRule.setFlagsParameterization(flags) + } + + @Before + fun setUp() { + kosmos.userManager = mock<UserManager> { on { mainUser } doReturn mainUser } + setAppWidgetIds(emptyList()) + overrideResource(R.array.config_communalWidgetAllowlist, fakeAllowlist.toTypedArray()) + restoreUser(mainUser) } @Test fun communalWidgets_queryWidgetsFromDb() = - testScope.runTest { + kosmos.runTest { val communalItemRankEntry = CommunalItemRank(uid = 1L, rank = 1) val communalWidgetItemEntry = - CommunalWidgetItem(uid = 1L, 1, "pk_name/cls_name", 1L, 0, 3) + CommunalWidgetItem( + uid = 1L, + widgetId = 1, + componentName = "pk_name/cls_name", + itemId = 1L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ) fakeWidgets.value = mapOf(communalItemRankEntry to communalWidgetItemEntry) fakeProviders.value = mapOf(1 to providerInfoA) @@ -158,7 +174,12 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { appWidgetId = communalWidgetItemEntry.widgetId, providerInfo = providerInfoA, rank = communalItemRankEntry.rank, - spanY = communalWidgetItemEntry.spanY, + spanY = + if (communalResponsiveGrid()) { + communalWidgetItemEntry.spanYNew + } else { + communalWidgetItemEntry.spanY + }, ) ) @@ -168,18 +189,50 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun communalWidgets_widgetsWithoutMatchingProvidersAreSkipped() = - testScope.runTest { + kosmos.runTest { // Set up 4 widgets, but widget 3 and 4 don't have matching providers fakeWidgets.value = mapOf( CommunalItemRank(uid = 1L, rank = 1) to - CommunalWidgetItem(uid = 1L, 1, "pk_1/cls_1", 1L, 0, 3), + CommunalWidgetItem( + uid = 1L, + widgetId = 1, + componentName = "pk_1/cls_1", + itemId = 1L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ), CommunalItemRank(uid = 2L, rank = 2) to - CommunalWidgetItem(uid = 2L, 2, "pk_2/cls_2", 2L, 0, 3), + CommunalWidgetItem( + uid = 2L, + widgetId = 2, + componentName = "pk_2/cls_2", + itemId = 2L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ), CommunalItemRank(uid = 3L, rank = 3) to - CommunalWidgetItem(uid = 3L, 3, "pk_3/cls_3", 3L, 0, 3), + CommunalWidgetItem( + uid = 3L, + widgetId = 3, + componentName = "pk_3/cls_3", + itemId = 3L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ), CommunalItemRank(uid = 4L, rank = 4) to - CommunalWidgetItem(uid = 4L, 4, "pk_4/cls_4", 4L, 0, 3), + CommunalWidgetItem( + uid = 4L, + widgetId = 4, + componentName = "pk_4/cls_4", + itemId = 4L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ), ) fakeProviders.value = mapOf(1 to providerInfoA, 2 to providerInfoB) @@ -191,27 +244,43 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { appWidgetId = 1, providerInfo = providerInfoA, rank = 1, - spanY = 3, + spanY = if (communalResponsiveGrid()) 1 else 3, ), CommunalWidgetContentModel.Available( appWidgetId = 2, providerInfo = providerInfoB, rank = 2, - spanY = 3, + spanY = if (communalResponsiveGrid()) 1 else 3, ), ) } @Test fun communalWidgets_updatedWhenProvidersUpdate() = - testScope.runTest { + kosmos.runTest { // Set up widgets and providers fakeWidgets.value = mapOf( CommunalItemRank(uid = 1L, rank = 1) to - CommunalWidgetItem(uid = 1L, 1, "pk_1/cls_1", 1L, 0, 3), + CommunalWidgetItem( + uid = 1L, + widgetId = 1, + componentName = "pk_1/cls_1", + itemId = 1L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ), CommunalItemRank(uid = 2L, rank = 2) to - CommunalWidgetItem(uid = 2L, 2, "pk_2/cls_2", 2L, 0, 3), + CommunalWidgetItem( + uid = 2L, + widgetId = 2, + componentName = "pk_2/cls_2", + itemId = 2L, + userSerialNumber = 0, + spanY = 6, + spanYNew = 2, + ), ) fakeProviders.value = mapOf(1 to providerInfoA, 2 to providerInfoB) @@ -224,13 +293,13 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { appWidgetId = 1, providerInfo = providerInfoA, rank = 1, - spanY = 3, + spanY = if (communalResponsiveGrid()) 1 else 3, ), CommunalWidgetContentModel.Available( appWidgetId = 2, providerInfo = providerInfoB, rank = 2, - spanY = 3, + spanY = if (communalResponsiveGrid()) 2 else 6, ), ) @@ -245,20 +314,20 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { // Verify that provider info updated providerInfo = providerInfoC, rank = 1, - spanY = 3, + spanY = if (communalResponsiveGrid()) 1 else 3, ), CommunalWidgetContentModel.Available( appWidgetId = 2, providerInfo = providerInfoB, rank = 2, - spanY = 3, + spanY = if (communalResponsiveGrid()) 2 else 6, ), ) } @Test fun addWidget_allocateId_bindWidget_andAddToDb() = - testScope.runTest { + kosmos.runTest { val provider = ComponentName("pkg_name", "cls_name") val id = 1 val rank = 1 @@ -275,7 +344,8 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { runCurrent() verify(communalWidgetHost).allocateIdAndBindWidget(provider, mainUser) - verify(communalWidgetDao).addWidget(id, provider, rank, testUserSerialNumber(mainUser)) + verify(communalWidgetDao) + .addWidget(id, provider, rank, testUserSerialNumber(mainUser), SpanValue.Fixed(3)) // Verify backup requested verify(backupManager).dataChanged() @@ -283,7 +353,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun addWidget_configurationFails_doNotAddWidgetToDb() = - testScope.runTest { + kosmos.runTest { val provider = ComponentName("pkg_name", "cls_name") val id = 1 val rank = 1 @@ -301,7 +371,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { verify(communalWidgetHost).allocateIdAndBindWidget(provider, mainUser) verify(communalWidgetDao, never()) - .addWidget(anyInt(), any<ComponentName>(), anyInt(), anyInt(), anyInt()) + .addWidget(anyInt(), any<ComponentName>(), anyInt(), anyInt(), any()) verify(appWidgetHost).deleteAppWidgetId(id) // Verify backup not requested @@ -310,7 +380,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun addWidget_configurationThrowsError_doNotAddWidgetToDb() = - testScope.runTest { + kosmos.runTest { val provider = ComponentName("pkg_name", "cls_name") val id = 1 val rank = 1 @@ -330,7 +400,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { verify(communalWidgetHost).allocateIdAndBindWidget(provider, mainUser) verify(communalWidgetDao, never()) - .addWidget(anyInt(), any<ComponentName>(), anyInt(), anyInt(), anyInt()) + .addWidget(anyInt(), any<ComponentName>(), anyInt(), anyInt(), any()) verify(appWidgetHost).deleteAppWidgetId(id) // Verify backup not requested @@ -339,7 +409,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun addWidget_configurationNotRequired_doesNotConfigure_addWidgetToDb() = - testScope.runTest { + kosmos.runTest { val provider = ComponentName("pkg_name", "cls_name") val id = 1 val rank = 1 @@ -356,7 +426,8 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { runCurrent() verify(communalWidgetHost).allocateIdAndBindWidget(provider, mainUser) - verify(communalWidgetDao).addWidget(id, provider, rank, testUserSerialNumber(mainUser)) + verify(communalWidgetDao) + .addWidget(id, provider, rank, testUserSerialNumber(mainUser), SpanValue.Fixed(3)) // Verify backup requested verify(backupManager).dataChanged() @@ -364,7 +435,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun deleteWidget_deleteFromDbTrue_alsoDeleteFromHost() = - testScope.runTest { + kosmos.runTest { val id = 1 whenever(communalWidgetDao.deleteWidgetById(eq(id))).thenReturn(true) underTest.deleteWidget(id) @@ -379,7 +450,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun deleteWidget_deleteFromDbFalse_doesNotDeleteFromHost() = - testScope.runTest { + kosmos.runTest { val id = 1 whenever(communalWidgetDao.deleteWidgetById(eq(id))).thenReturn(false) underTest.deleteWidget(id) @@ -394,7 +465,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun reorderWidgets_queryDb() = - testScope.runTest { + kosmos.runTest { val widgetIdToRankMap = mapOf(104 to 1, 103 to 2, 101 to 3) underTest.updateWidgetOrder(widgetIdToRankMap) runCurrent() @@ -407,7 +478,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun restoreWidgets_deleteStateFileIfRestoreFails() = - testScope.runTest { + kosmos.runTest { // Write a state file that is invalid, and verify it is written backupUtils.writeBytesToDisk(byteArrayOf(1, 2, 3, 4, 5, 6)) assertThat(backupUtils.fileExists()).isTrue() @@ -422,7 +493,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun restoreWidgets_deleteStateFileAfterWidgetsRestored() = - testScope.runTest { + kosmos.runTest { // Write a state file, and verify it is written backupUtils.writeBytesToDisk(fakeState.toByteArray()) assertThat(backupUtils.fileExists()).isTrue() @@ -443,7 +514,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun restoreWidgets_restoredWidgetsNotRegisteredWithHostAreSkipped() = - testScope.runTest { + kosmos.runTest { // Write fake state to file backupUtils.writeBytesToDisk(fakeState.toByteArray()) @@ -470,7 +541,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun restoreWidgets_registeredWidgetsNotRestoredAreRemoved() = - testScope.runTest { + kosmos.runTest { // Write fake state to file backupUtils.writeBytesToDisk(fakeState.toByteArray()) @@ -504,7 +575,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun restoreWidgets_onlySomeWidgetsGotNewIds() = - testScope.runTest { + kosmos.runTest { // Write fake state to file backupUtils.writeBytesToDisk(fakeState.toByteArray()) @@ -536,7 +607,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun restoreWidgets_undefinedUser_restoredAsMain() = - testScope.runTest { + kosmos.runTest { // Write two widgets to file, both of which have user serial number undefined. val fakeState = CommunalHubState().apply { @@ -584,7 +655,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun restoreWidgets_workProfileNotRestored_widgetSkipped() = - testScope.runTest { + kosmos.runTest { // Write fake state to file backupUtils.writeBytesToDisk(fakeStateWithWorkProfile.toByteArray()) @@ -610,7 +681,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun restoreWidgets_workProfileRestored_manuallyBindWidget() = - testScope.runTest { + kosmos.runTest { // Write fake state to file backupUtils.writeBytesToDisk(fakeStateWithWorkProfile.toByteArray()) @@ -649,7 +720,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { componentNameCaptor.capture(), eq(2), eq(testUserSerialNumber(workProfile)), - anyInt(), + any(), ) assertThat(componentNameCaptor.firstValue) @@ -658,13 +729,29 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { @Test fun pendingWidgets() = - testScope.runTest { + kosmos.runTest { fakeWidgets.value = mapOf( CommunalItemRank(uid = 1L, rank = 1) to - CommunalWidgetItem(uid = 1L, 1, "pk_1/cls_1", 1L, 0, 3), + CommunalWidgetItem( + uid = 1L, + widgetId = 1, + componentName = "pk_1/cls_1", + itemId = 1L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ), CommunalItemRank(uid = 2L, rank = 2) to - CommunalWidgetItem(uid = 2L, 2, "pk_2/cls_2", 2L, 0, 3), + CommunalWidgetItem( + uid = 2L, + widgetId = 2, + componentName = "pk_2/cls_2", + itemId = 2L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ), ) // Widget 1 is installed @@ -672,7 +759,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { // Widget 2 is pending install val fakeIcon = mock<Bitmap>() - packageChangeRepository.setInstallSessions( + fakePackageChangeRepository.setInstallSessions( listOf( PackageInstallSession( sessionId = 1, @@ -690,7 +777,7 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { appWidgetId = 1, providerInfo = providerInfoA, rank = 1, - spanY = 3, + spanY = if (communalResponsiveGrid()) 1 else 3, ), CommunalWidgetContentModel.Pending( appWidgetId = 2, @@ -698,23 +785,31 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { componentName = ComponentName("pk_2", "cls_2"), icon = fakeIcon, user = mainUser, - spanY = 3, + spanY = if (communalResponsiveGrid()) 1 else 3, ), ) } @Test fun pendingWidgets_pendingWidgetBecomesAvailableAfterInstall() = - testScope.runTest { + kosmos.runTest { fakeWidgets.value = mapOf( CommunalItemRank(uid = 1L, rank = 1) to - CommunalWidgetItem(uid = 1L, 1, "pk_1/cls_1", 1L, 0, 3) + CommunalWidgetItem( + uid = 1L, + widgetId = 1, + componentName = "pk_1/cls_1", + itemId = 1L, + userSerialNumber = 0, + spanY = 3, + spanYNew = 1, + ) ) // Widget 1 is pending install val fakeIcon = mock<Bitmap>() - packageChangeRepository.setInstallSessions( + fakePackageChangeRepository.setInstallSessions( listOf( PackageInstallSession( sessionId = 1, @@ -734,12 +829,12 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { componentName = ComponentName("pk_1", "cls_1"), icon = fakeIcon, user = mainUser, - spanY = 3, + spanY = if (communalResponsiveGrid()) 1 else 3, ) ) // Package for widget 1 finished installing - packageChangeRepository.setInstallSessions(emptyList()) + fakePackageChangeRepository.setInstallSessions(emptyList()) // Provider info for widget 1 becomes available fakeProviders.value = mapOf(1 to providerInfoA) @@ -752,15 +847,32 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { appWidgetId = 1, providerInfo = providerInfoA, rank = 1, - spanY = 3, + spanY = if (communalResponsiveGrid()) 1 else 3, ) ) } @Test @EnableFlags(FLAG_COMMUNAL_WIDGET_RESIZING) - fun updateWidgetSpanY_updatesWidgetInDaoAndRequestsBackup() = - testScope.runTest { + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) + fun updateWidgetSpanY_updatesWidgetInDaoAndRequestsBackup_fixed() = + kosmos.runTest { + val widgetId = 1 + val newSpanY = 6 + val widgetIdToRankMap = emptyMap<Int, Int>() + + underTest.resizeWidget(widgetId, newSpanY, widgetIdToRankMap) + runCurrent() + + verify(communalWidgetDao) + .resizeWidget(widgetId, SpanValue.Fixed(newSpanY), widgetIdToRankMap) + verify(backupManager).dataChanged() + } + + @Test + @EnableFlags(FLAG_COMMUNAL_WIDGET_RESIZING, FLAG_COMMUNAL_RESPONSIVE_GRID) + fun updateWidgetSpanY_updatesWidgetInDaoAndRequestsBackup_responsive() = + kosmos.runTest { val widgetId = 1 val newSpanY = 6 val widgetIdToRankMap = emptyMap<Int, Int>() @@ -768,7 +880,8 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { underTest.resizeWidget(widgetId, newSpanY, widgetIdToRankMap) runCurrent() - verify(communalWidgetDao).resizeWidget(widgetId, newSpanY, widgetIdToRankMap) + verify(communalWidgetDao) + .resizeWidget(widgetId, SpanValue.Responsive(newSpanY), widgetIdToRankMap) verify(backupManager).dataChanged() } @@ -784,13 +897,19 @@ class CommunalWidgetRepositoryLocalImplTest : SysuiTestCase() { } private fun restoreUser(user: UserHandle) { - whenever(backupManager.getUserForAncestralSerialNumber(user.identifier.toLong())) + whenever(kosmos.backupManager.getUserForAncestralSerialNumber(user.identifier.toLong())) .thenReturn(user) - whenever(userManager.getUserSerialNumber(user.identifier)) + whenever(kosmos.userManager.getUserSerialNumber(user.identifier)) .thenReturn(testUserSerialNumber(user)) } - private companion object { + companion object { + @JvmStatic + @Parameters(name = "{0}") + fun getParams(): List<FlagsParameterization> { + return FlagsParameterization.allCombinationsOf(FLAG_COMMUNAL_RESPONSIVE_GRID) + } + val PROVIDER_INFO_REQUIRES_CONFIGURATION = AppWidgetProviderInfo().apply { configure = ComponentName("test.pkg", "test.cmp") } val PROVIDER_INFO_CONFIGURATION_OPTIONAL = diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt index 611a61a6282c..b9e646fee98f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt @@ -24,14 +24,16 @@ import android.content.pm.UserInfo import android.os.UserHandle import android.os.UserManager import android.os.userManager +import android.platform.test.annotations.DisableFlags import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.FlagsParameterization import android.provider.Settings import android.provider.Settings.Secure.HUB_MODE_TUTORIAL_COMPLETED import android.widget.RemoteViews -import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.compose.animation.scene.ObservableTransitionState import com.android.systemui.Flags.FLAG_COMMUNAL_HUB +import com.android.systemui.Flags.FLAG_COMMUNAL_RESPONSIVE_GRID import com.android.systemui.Flags.FLAG_COMMUNAL_WIDGET_RESIZING import com.android.systemui.SysuiTestCase import com.android.systemui.broadcast.broadcastDispatcher @@ -96,6 +98,8 @@ import org.mockito.Mock import org.mockito.Mockito.mock import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters /** * This class of test cases assume that communal is enabled. For disabled cases, see @@ -103,8 +107,8 @@ import org.mockito.MockitoAnnotations */ @SmallTest @OptIn(ExperimentalCoroutinesApi::class) -@RunWith(AndroidJUnit4::class) -class CommunalInteractorTest : SysuiTestCase() { +@RunWith(ParameterizedAndroidJunit4::class) +class CommunalInteractorTest(flags: FlagsParameterization) : SysuiTestCase() { @Mock private lateinit var mainUser: UserInfo @Mock private lateinit var secondaryUser: UserInfo @@ -129,6 +133,10 @@ class CommunalInteractorTest : SysuiTestCase() { private lateinit var underTest: CommunalInteractor + init { + mSetFlagsRule.setFlagsParameterization(flags) + } + @Before fun setUp() { MockitoAnnotations.initMocks(this) @@ -262,71 +270,84 @@ class CommunalInteractorTest : SysuiTestCase() { assertThat(widgetContent!![2].appWidgetId).isEqualTo(3) } + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun smartspaceDynamicSizing_oneCard_fullSize() = testSmartspaceDynamicSizing( totalTargets = 1, - expectedSizes = listOf(CommunalContentSize.FULL), + expectedSizes = listOf(CommunalContentSize.FixedSize.FULL), ) + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun smartspace_dynamicSizing_twoCards_halfSize() = testSmartspaceDynamicSizing( totalTargets = 2, - expectedSizes = listOf(CommunalContentSize.HALF, CommunalContentSize.HALF), + expectedSizes = + listOf(CommunalContentSize.FixedSize.HALF, CommunalContentSize.FixedSize.HALF), ) + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun smartspace_dynamicSizing_threeCards_thirdSize() = testSmartspaceDynamicSizing( totalTargets = 3, expectedSizes = listOf( - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, ), ) + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun smartspace_dynamicSizing_fourCards_threeThirdSizeAndOneFullSize() = testSmartspaceDynamicSizing( totalTargets = 4, expectedSizes = listOf( - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.FULL, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.FULL, ), ) + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun smartspace_dynamicSizing_fiveCards_threeThirdAndTwoHalfSize() = testSmartspaceDynamicSizing( totalTargets = 5, expectedSizes = listOf( - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.HALF, - CommunalContentSize.HALF, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.HALF, + CommunalContentSize.FixedSize.HALF, ), ) + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun smartspace_dynamicSizing_sixCards_allThirdSize() = testSmartspaceDynamicSizing( totalTargets = 6, expectedSizes = listOf( - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, - CommunalContentSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, + CommunalContentSize.FixedSize.THIRD, ), ) @@ -383,7 +404,9 @@ class CommunalInteractorTest : SysuiTestCase() { assertThat(umoContent?.size).isEqualTo(0) } + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun ongoing_shouldOrderAndSizeByTimestamp() = testScope.runTest { // Keyguard showing, and tutorial completed. @@ -410,15 +433,15 @@ class CommunalInteractorTest : SysuiTestCase() { assertThat(ongoingContent?.size).isEqualTo(4) assertThat(ongoingContent?.get(0)?.key) .isEqualTo(CommunalContentModel.KEY.smartspace("timer3")) - assertThat(ongoingContent?.get(0)?.size).isEqualTo(CommunalContentSize.HALF) + assertThat(ongoingContent?.get(0)?.size).isEqualTo(CommunalContentSize.FixedSize.HALF) assertThat(ongoingContent?.get(1)?.key) .isEqualTo(CommunalContentModel.KEY.smartspace("timer2")) - assertThat(ongoingContent?.get(1)?.size).isEqualTo(CommunalContentSize.HALF) + assertThat(ongoingContent?.get(1)?.size).isEqualTo(CommunalContentSize.FixedSize.HALF) assertThat(ongoingContent?.get(2)?.key).isEqualTo(CommunalContentModel.KEY.umo()) - assertThat(ongoingContent?.get(2)?.size).isEqualTo(CommunalContentSize.HALF) + assertThat(ongoingContent?.get(2)?.size).isEqualTo(CommunalContentSize.FixedSize.HALF) assertThat(ongoingContent?.get(3)?.key) .isEqualTo(CommunalContentModel.KEY.smartspace("timer1")) - assertThat(ongoingContent?.get(3)?.size).isEqualTo(CommunalContentSize.HALF) + assertThat(ongoingContent?.get(3)?.size).isEqualTo(CommunalContentSize.FixedSize.HALF) } @Test @@ -1082,6 +1105,7 @@ class CommunalInteractorTest : SysuiTestCase() { @Test @EnableFlags(FLAG_COMMUNAL_WIDGET_RESIZING) + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun resizeWidget_withoutUpdatingOrder() = testScope.runTest { val userInfos = listOf(MAIN_USER_INFO) @@ -1094,45 +1118,97 @@ class CommunalInteractorTest : SysuiTestCase() { appWidgetId = 1, userId = MAIN_USER_INFO.id, rank = 0, - spanY = CommunalContentSize.HALF.span, + spanY = CommunalContentSize.FixedSize.HALF.span, ) widgetRepository.addWidget( appWidgetId = 2, userId = MAIN_USER_INFO.id, rank = 1, - spanY = CommunalContentSize.HALF.span, + spanY = CommunalContentSize.FixedSize.HALF.span, ) widgetRepository.addWidget( appWidgetId = 3, userId = MAIN_USER_INFO.id, rank = 2, - spanY = CommunalContentSize.HALF.span, + spanY = CommunalContentSize.FixedSize.HALF.span, ) val widgetContent by collectLastValue(underTest.widgetContent) assertThat(widgetContent?.map { it.appWidgetId to it.size }) .containsExactly( - 1 to CommunalContentSize.HALF, - 2 to CommunalContentSize.HALF, - 3 to CommunalContentSize.HALF, + 1 to CommunalContentSize.FixedSize.HALF, + 2 to CommunalContentSize.FixedSize.HALF, + 3 to CommunalContentSize.FixedSize.HALF, ) .inOrder() - underTest.resizeWidget(2, CommunalContentSize.FULL.span, emptyMap()) + underTest.resizeWidget(2, CommunalContentSize.FixedSize.FULL.span, emptyMap()) // Widget 2 should have been resized to FULL assertThat(widgetContent?.map { it.appWidgetId to it.size }) .containsExactly( - 1 to CommunalContentSize.HALF, - 2 to CommunalContentSize.FULL, - 3 to CommunalContentSize.HALF, + 1 to CommunalContentSize.FixedSize.HALF, + 2 to CommunalContentSize.FixedSize.FULL, + 3 to CommunalContentSize.FixedSize.HALF, + ) + .inOrder() + } + + @Test + @EnableFlags(FLAG_COMMUNAL_WIDGET_RESIZING, FLAG_COMMUNAL_RESPONSIVE_GRID) + fun resizeWidget_withoutUpdatingOrder_responsive() = + testScope.runTest { + val userInfos = listOf(MAIN_USER_INFO) + userRepository.setUserInfos(userInfos) + userTracker.set(userInfos = userInfos, selectedUserIndex = 0) + runCurrent() + + // Widgets available. + widgetRepository.addWidget( + appWidgetId = 1, + userId = MAIN_USER_INFO.id, + rank = 0, + spanY = 1, + ) + widgetRepository.addWidget( + appWidgetId = 2, + userId = MAIN_USER_INFO.id, + rank = 1, + spanY = 1, + ) + widgetRepository.addWidget( + appWidgetId = 3, + userId = MAIN_USER_INFO.id, + rank = 2, + spanY = 1, + ) + + val widgetContent by collectLastValue(underTest.widgetContent) + + assertThat(widgetContent?.map { it.appWidgetId to it.size }) + .containsExactly( + 1 to CommunalContentSize.Responsive(1), + 2 to CommunalContentSize.Responsive(1), + 3 to CommunalContentSize.Responsive(1), + ) + .inOrder() + + underTest.resizeWidget(appWidgetId = 2, spanY = 5, widgetIdToRankMap = emptyMap()) + + // Widget 2 should have been resized to FULL + assertThat(widgetContent?.map { it.appWidgetId to it.size }) + .containsExactly( + 1 to CommunalContentSize.Responsive(1), + 2 to CommunalContentSize.Responsive(5), + 3 to CommunalContentSize.Responsive(1), ) .inOrder() } @Test @EnableFlags(FLAG_COMMUNAL_WIDGET_RESIZING) + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun resizeWidget_andUpdateOrder() = testScope.runTest { val userInfos = listOf(MAIN_USER_INFO) @@ -1145,39 +1221,98 @@ class CommunalInteractorTest : SysuiTestCase() { appWidgetId = 1, userId = MAIN_USER_INFO.id, rank = 0, - spanY = CommunalContentSize.HALF.span, + spanY = CommunalContentSize.FixedSize.HALF.span, + ) + widgetRepository.addWidget( + appWidgetId = 2, + userId = MAIN_USER_INFO.id, + rank = 1, + spanY = CommunalContentSize.FixedSize.HALF.span, + ) + widgetRepository.addWidget( + appWidgetId = 3, + userId = MAIN_USER_INFO.id, + rank = 2, + spanY = CommunalContentSize.FixedSize.HALF.span, + ) + + val widgetContent by collectLastValue(underTest.widgetContent) + + assertThat(widgetContent?.map { it.appWidgetId to it.size }) + .containsExactly( + 1 to CommunalContentSize.FixedSize.HALF, + 2 to CommunalContentSize.FixedSize.HALF, + 3 to CommunalContentSize.FixedSize.HALF, + ) + .inOrder() + + underTest.resizeWidget( + 2, + CommunalContentSize.FixedSize.FULL.span, + mapOf(2 to 0, 1 to 1), + ) + + // Widget 2 should have been resized to FULL and moved to the front of the list + assertThat(widgetContent?.map { it.appWidgetId to it.size }) + .containsExactly( + 2 to CommunalContentSize.FixedSize.FULL, + 1 to CommunalContentSize.FixedSize.HALF, + 3 to CommunalContentSize.FixedSize.HALF, + ) + .inOrder() + } + + @Test + @EnableFlags(FLAG_COMMUNAL_WIDGET_RESIZING, FLAG_COMMUNAL_RESPONSIVE_GRID) + fun resizeWidget_andUpdateOrder_responsive() = + testScope.runTest { + val userInfos = listOf(MAIN_USER_INFO) + userRepository.setUserInfos(userInfos) + userTracker.set(userInfos = userInfos, selectedUserIndex = 0) + runCurrent() + + // Widgets available. + widgetRepository.addWidget( + appWidgetId = 1, + userId = MAIN_USER_INFO.id, + rank = 0, + spanY = 1, ) widgetRepository.addWidget( appWidgetId = 2, userId = MAIN_USER_INFO.id, rank = 1, - spanY = CommunalContentSize.HALF.span, + spanY = 1, ) widgetRepository.addWidget( appWidgetId = 3, userId = MAIN_USER_INFO.id, rank = 2, - spanY = CommunalContentSize.HALF.span, + spanY = 1, ) val widgetContent by collectLastValue(underTest.widgetContent) assertThat(widgetContent?.map { it.appWidgetId to it.size }) .containsExactly( - 1 to CommunalContentSize.HALF, - 2 to CommunalContentSize.HALF, - 3 to CommunalContentSize.HALF, + 1 to CommunalContentSize.Responsive(1), + 2 to CommunalContentSize.Responsive(1), + 3 to CommunalContentSize.Responsive(1), ) .inOrder() - underTest.resizeWidget(2, CommunalContentSize.FULL.span, mapOf(2 to 0, 1 to 1)) + underTest.resizeWidget( + appWidgetId = 2, + spanY = 5, + widgetIdToRankMap = mapOf(2 to 0, 1 to 1), + ) // Widget 2 should have been resized to FULL and moved to the front of the list assertThat(widgetContent?.map { it.appWidgetId to it.size }) .containsExactly( - 2 to CommunalContentSize.FULL, - 1 to CommunalContentSize.HALF, - 3 to CommunalContentSize.HALF, + 2 to CommunalContentSize.Responsive(5), + 1 to CommunalContentSize.Responsive(1), + 3 to CommunalContentSize.Responsive(1), ) .inOrder() } @@ -1191,9 +1326,15 @@ class CommunalInteractorTest : SysuiTestCase() { ) } - private companion object { - val MAIN_USER_INFO = UserInfo(0, "primary", UserInfo.FLAG_MAIN) - val USER_INFO_WORK = + companion object { + @JvmStatic + @Parameters(name = "{0}") + fun getParams(): List<FlagsParameterization> { + return FlagsParameterization.allCombinationsOf(FLAG_COMMUNAL_RESPONSIVE_GRID) + } + + private val MAIN_USER_INFO = UserInfo(0, "primary", UserInfo.FLAG_MAIN) + private val USER_INFO_WORK = UserInfo( 10, "work", diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/CommunalUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/CommunalUserActionsViewModelTest.kt index 755c4ebf5016..ca7e2032be93 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/CommunalUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/ui/viewmodel/CommunalUserActionsViewModelTest.kt @@ -85,8 +85,7 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) - assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true)) + assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade)) setUpState( isShadeTouchable = false, @@ -103,8 +102,7 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) - assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true)) + assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade)) } @Test @@ -122,7 +120,7 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) setUpState( isShadeTouchable = false, @@ -140,7 +138,7 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) } @Test @@ -158,9 +156,7 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo( - UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) - ) + .isEqualTo(UserActionResult.ShowOverlay(Overlays.NotificationsShade)) setUpState( isShadeTouchable = false, @@ -174,9 +170,7 @@ class CommunalUserActionsViewModelTest : SysuiTestCase() { assertThat(actions?.get(Swipe.End)).isEqualTo(UserActionResult(SceneFamilies.Home)) assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo( - UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) - ) + .isEqualTo(UserActionResult.ShowOverlay(Overlays.NotificationsShade)) } private fun TestScope.setUpState( diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt index 3eba8ff4b198..763ea392deb9 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt @@ -18,12 +18,14 @@ package com.android.systemui.communal.view.viewmodel import android.content.ComponentName import android.content.pm.UserInfo +import android.platform.test.annotations.DisableFlags import android.platform.test.flag.junit.FlagsParameterization import android.provider.Settings import android.widget.RemoteViews import androidx.test.filters.SmallTest import com.android.compose.animation.scene.ObservableTransitionState import com.android.systemui.Flags.FLAG_COMMUNAL_HUB +import com.android.systemui.Flags.FLAG_COMMUNAL_RESPONSIVE_GRID import com.android.systemui.SysuiTestCase import com.android.systemui.communal.data.model.CommunalSmartspaceTimer import com.android.systemui.communal.data.repository.FakeCommunalMediaRepository @@ -248,7 +250,9 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { .isInstanceOf(CommunalContentModel.CtaTileInViewMode::class.java) } + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun ongoingContent_umoAndOneTimer_sizedAppropriately() = testScope.runTest { // Widgets available. @@ -280,11 +284,13 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { assertThat(timer).isInstanceOf(CommunalContentModel.Smartspace::class.java) assertThat(umo).isInstanceOf(CommunalContentModel.Umo::class.java) - assertThat(timer?.size).isEqualTo(CommunalContentSize.HALF) - assertThat(umo?.size).isEqualTo(CommunalContentSize.HALF) + assertThat(timer?.size).isEqualTo(CommunalContentSize.FixedSize.HALF) + assertThat(umo?.size).isEqualTo(CommunalContentSize.FixedSize.HALF) } + /** TODO(b/378171351): Handle ongoing content in responsive grid. */ @Test + @DisableFlags(FLAG_COMMUNAL_RESPONSIVE_GRID) fun ongoingContent_umoAndTwoTimers_sizedAppropriately() = testScope.runTest { // Widgets available. @@ -324,9 +330,9 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { assertThat(umo).isInstanceOf(CommunalContentModel.Umo::class.java) // One full-sized timer and a half-sized timer and half-sized UMO. - assertThat(timer1?.size).isEqualTo(CommunalContentSize.HALF) - assertThat(timer2?.size).isEqualTo(CommunalContentSize.HALF) - assertThat(umo?.size).isEqualTo(CommunalContentSize.FULL) + assertThat(timer1?.size).isEqualTo(CommunalContentSize.FixedSize.HALF) + assertThat(timer2?.size).isEqualTo(CommunalContentSize.FixedSize.HALF) + assertThat(umo?.size).isEqualTo(CommunalContentSize.FixedSize.FULL) } @Test @@ -891,7 +897,8 @@ class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { @JvmStatic @Parameters(name = "{0}") fun getParams(): List<FlagsParameterization> { - return FlagsParameterization.allCombinationsOf().andSceneContainer() + return FlagsParameterization.allCombinationsOf(FLAG_COMMUNAL_RESPONSIVE_GRID) + .andSceneContainer() } } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/ui/viewmodel/DreamUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/ui/viewmodel/DreamUserActionsViewModelTest.kt index 55b87db232e8..d6daa794c45b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/ui/viewmodel/DreamUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/ui/viewmodel/DreamUserActionsViewModelTest.kt @@ -86,8 +86,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { ) assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) - assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true)) + assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade)) assertThat(actions?.get(Swipe.Start)).isNull() assertThat(actions?.get(Swipe.End)).isNull() @@ -105,8 +104,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { ) assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) - assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true)) + assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade)) assertThat(actions?.get(Swipe.Start)).isNull() assertThat(actions?.get(Swipe.End)).isNull() } @@ -127,7 +125,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) assertThat(actions?.get(Swipe.Start)).isNull() assertThat(actions?.get(Swipe.End)).isNull() @@ -146,7 +144,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) assertThat(actions?.get(Swipe.Start)).isNull() assertThat(actions?.get(Swipe.End)).isNull() } @@ -167,9 +165,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo( - UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) - ) + .isEqualTo(UserActionResult.ShowOverlay(Overlays.NotificationsShade)) assertThat(actions?.get(Swipe.Start)).isNull() assertThat(actions?.get(Swipe.End)).isNull() @@ -184,9 +180,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo( - UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) - ) + .isEqualTo(UserActionResult.ShowOverlay(Overlays.NotificationsShade)) assertThat(actions?.get(Swipe.Start)).isNull() assertThat(actions?.get(Swipe.End)).isNull() } @@ -206,8 +200,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { ) assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) - assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true)) + assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade)) assertThat(actions?.get(Swipe.Start)).isEqualTo(UserActionResult(Scenes.Communal)) assertThat(actions?.get(Swipe.End)).isNull() @@ -225,8 +218,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { ) assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) - assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, isIrreversible = true)) + assertThat(actions?.get(Swipe.Down)).isEqualTo(UserActionResult(Scenes.Shade)) assertThat(actions?.get(Swipe.Start)).isEqualTo(UserActionResult(Scenes.Communal)) assertThat(actions?.get(Swipe.End)).isNull() } @@ -247,7 +239,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) assertThat(actions?.get(Swipe.Start)).isEqualTo(UserActionResult(Scenes.Communal)) assertThat(actions?.get(Swipe.End)).isNull() @@ -266,7 +258,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) assertThat(actions?.get(Swipe.Start)).isEqualTo(UserActionResult(Scenes.Communal)) assertThat(actions?.get(Swipe.End)).isNull() } @@ -287,9 +279,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Bouncer)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo( - UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) - ) + .isEqualTo(UserActionResult.ShowOverlay(Overlays.NotificationsShade)) assertThat(actions?.get(Swipe.Start)).isEqualTo(UserActionResult(Scenes.Communal)) assertThat(actions?.get(Swipe.End)).isNull() @@ -304,9 +294,7 @@ class DreamUserActionsViewModelTest : SysuiTestCase() { assertThat(actions).isNotEmpty() assertThat(actions?.get(Swipe.Up)).isEqualTo(UserActionResult(Scenes.Gone)) assertThat(actions?.get(Swipe.Down)) - .isEqualTo( - UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) - ) + .isEqualTo(UserActionResult.ShowOverlay(Overlays.NotificationsShade)) assertThat(actions?.get(Swipe.Start)).isEqualTo(UserActionResult(Scenes.Communal)) assertThat(actions?.get(Swipe.End)).isNull() } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduUiCoordinatorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduUiCoordinatorTest.kt index e288522ec212..248b922bcc77 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduUiCoordinatorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/ui/view/ContextualEduUiCoordinatorTest.kt @@ -20,18 +20,20 @@ import android.app.Dialog import android.app.Notification import android.app.NotificationManager import android.content.applicationContext -import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.contextualeducation.GestureType +import com.android.systemui.contextualeducation.GestureType.ALL_APPS import com.android.systemui.contextualeducation.GestureType.BACK import com.android.systemui.contextualeducation.GestureType.HOME +import com.android.systemui.contextualeducation.GestureType.OVERVIEW import com.android.systemui.education.data.repository.fakeEduClock import com.android.systemui.education.domain.interactor.KeyboardTouchpadEduInteractor import com.android.systemui.education.domain.interactor.contextualEducationInteractor import com.android.systemui.education.domain.interactor.keyboardTouchpadEduInteractor import com.android.systemui.education.ui.view.ContextualEduUiCoordinator import com.android.systemui.education.ui.viewmodel.ContextualEduViewModel +import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.kosmos.testScope import com.android.systemui.res.R @@ -56,11 +58,13 @@ import org.mockito.kotlin.any import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.mockito.kotlin.whenever +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters @SmallTest -@RunWith(AndroidJUnit4::class) +@RunWith(ParameterizedAndroidJunit4::class) @OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class) -class ContextualEduUiCoordinatorTest : SysuiTestCase() { +class ContextualEduUiCoordinatorTest(private val gestureType: GestureType) : SysuiTestCase() { private val kosmos = testKosmos() private val testScope = kosmos.testScope private val interactor = kosmos.contextualEducationInteractor @@ -112,23 +116,23 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { @Test fun showDialogOnNewEdu() = testScope.runTest { - triggerEducation(BACK) + triggerEducation(gestureType) verify(dialog).show() } @Test fun showNotificationOn2ndEdu() = testScope.runTest { - triggerEducation(BACK) + triggerEducation(gestureType) eduClock.offset(minDurationForNextEdu) - triggerEducation(BACK) + triggerEducation(gestureType) verify(notificationManager).notifyAsUser(any(), anyInt(), any(), any()) } @Test fun dismissDialogAfterTimeout() = testScope.runTest { - triggerEducation(BACK) + triggerEducation(gestureType) advanceTimeBy(timeoutMillis + 1) verify(dialog).dismiss() } @@ -142,26 +146,59 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { } @Test - fun verifyBackEduToastContent() = + fun verifyEduToastContent() = testScope.runTest { - triggerEducation(BACK) - assertThat(toastContent).isEqualTo(context.getString(R.string.back_edu_toast_content)) + triggerEducation(gestureType) + + val expectedContent = + when (gestureType) { + BACK -> R.string.back_edu_toast_content + HOME -> R.string.home_edu_toast_content + OVERVIEW -> R.string.overview_edu_toast_content + ALL_APPS -> R.string.all_apps_edu_toast_content + } + + assertThat(toastContent).isEqualTo(context.getString(expectedContent)) } @Test - fun verifyBackEduNotificationContent() = + fun verifyEduNotificationContent() = testScope.runTest { val notificationCaptor = ArgumentCaptor.forClass(Notification::class.java) - triggerEducation(BACK) + triggerEducation(gestureType) eduClock.offset(minDurationForNextEdu) - triggerEducation(BACK) + triggerEducation(gestureType) verify(notificationManager) .notifyAsUser(any(), anyInt(), notificationCaptor.capture(), any()) + + val expectedTitle = + when (gestureType) { + BACK -> R.string.back_edu_notification_title + HOME -> R.string.home_edu_notification_title + OVERVIEW -> R.string.overview_edu_notification_title + ALL_APPS -> R.string.all_apps_edu_notification_title + } + + val expectedContent = + when (gestureType) { + BACK -> R.string.back_edu_notification_content + HOME -> R.string.home_edu_notification_content + OVERVIEW -> R.string.overview_edu_notification_content + ALL_APPS -> R.string.all_apps_edu_notification_content + } + + val expectedTutorialClassName = + when (gestureType) { + OVERVIEW -> TUTORIAL_ACTION + else -> KeyboardTouchpadTutorialActivity::class.qualifiedName + } + verifyNotificationContent( - R.string.back_edu_notification_title, - R.string.back_edu_notification_content, + expectedTitle, + expectedContent, + expectedTutorialClassName, notificationCaptor.value, ) } @@ -169,6 +206,7 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { private fun verifyNotificationContent( titleResId: Int, contentResId: Int, + expectedTutorialClassName: String?, notification: Notification, ) { val expectedContent = context.getString(contentResId) @@ -177,6 +215,10 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { val actualTitle = notification.getString(Notification.EXTRA_TITLE) assertThat(actualContent).isEqualTo(expectedContent) assertThat(actualTitle).isEqualTo(expectedTitle) + val actualTutorialClassName = + notification.contentIntent.intent.component?.className + ?: notification.contentIntent.intent.action + assertThat(actualTutorialClassName).isEqualTo(expectedTutorialClassName) } private fun Notification.getString(key: String): String = @@ -188,4 +230,14 @@ class ContextualEduUiCoordinatorTest : SysuiTestCase() { } runCurrent() } + + companion object { + @JvmStatic + @Parameters(name = "{0}") + fun getGestureTypes(): List<GestureType> { + return listOf(BACK, HOME, OVERVIEW, ALL_APPS) + } + + private const val TUTORIAL_ACTION: String = "com.android.systemui.action.TOUCHPAD_TUTORIAL" + } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/repository/DefaultShortcutCategoriesRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/repository/DefaultShortcutCategoriesRepositoryTest.kt index f90ab1fcc75b..3bf59f34db76 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/repository/DefaultShortcutCategoriesRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/repository/DefaultShortcutCategoriesRepositoryTest.kt @@ -40,6 +40,9 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue import com.android.systemui.keyboard.shortcut.data.source.FakeKeyboardShortcutGroupsSource import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts +import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts.CYCLE_BACK_THROUGH_RECENT_APPS_SHORTCUT_LABEL +import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts.CYCLE_FORWARD_THROUGH_RECENT_APPS_SHORTCUT_LABEL +import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts.recentAppsGroup import com.android.systemui.keyboard.shortcut.defaultShortcutCategoriesRepository import com.android.systemui.keyboard.shortcut.shared.model.Shortcut import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategory @@ -270,6 +273,31 @@ class DefaultShortcutCategoriesRepositoryTest : SysuiTestCase() { assertThat(systemCategory).isEqualTo(expectedCategory) } + @Test + fun categories_recentAppsSwitchShortcutsIsMarkedNonCustomizable() { + testScope.runTest { + helper.setImeShortcuts(emptyList()) + fakeSystemSource.setGroups(emptyList()) + fakeMultiTaskingSource.setGroups(recentAppsGroup) + + helper.showFromActivity() + val categories by collectLastValue(repo.categories) + + val cycleForwardThroughRecentAppsShortcut = + categories?.first { it.type == ShortcutCategoryType.MultiTasking } + ?.subCategories?.first { it.label == recentAppsGroup.label } + ?.shortcuts?.first { it.label == CYCLE_FORWARD_THROUGH_RECENT_APPS_SHORTCUT_LABEL } + + val cycleBackThroughRecentAppsShortcut = + categories?.first { it.type == ShortcutCategoryType.MultiTasking } + ?.subCategories?.first { it.label == recentAppsGroup.label } + ?.shortcuts?.first { it.label == CYCLE_BACK_THROUGH_RECENT_APPS_SHORTCUT_LABEL } + + assertThat(cycleForwardThroughRecentAppsShortcut?.isCustomizable).isFalse() + assertThat(cycleBackThroughRecentAppsShortcut?.isCustomizable).isFalse() + } + } + private fun simpleSubCategory(vararg shortcuts: Shortcut) = ShortcutSubCategory(simpleGroupLabel, shortcuts.asList()) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/source/TestShortcuts.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/source/TestShortcuts.kt index c287da8df135..75190e973c1b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/source/TestShortcuts.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/data/source/TestShortcuts.kt @@ -57,14 +57,14 @@ object TestShortcuts { KeyboardShortcutInfo( /* label = */ "Shortcut with repeated label", /* keycode = */ KeyEvent.KEYCODE_H, - /* modifiers = */ KeyEvent.META_META_ON, + /* modifiers = */ META_META_ON, ) private val shortcutInfoWithRepeatedLabelAlternate = KeyboardShortcutInfo( /* label = */ shortcutInfoWithRepeatedLabel.label, /* keycode = */ KeyEvent.KEYCODE_L, - /* modifiers = */ KeyEvent.META_META_ON, + /* modifiers = */ META_META_ON, ) private val shortcutInfoWithRepeatedLabelSecondAlternate = @@ -74,6 +74,27 @@ object TestShortcuts { /* modifiers = */ KeyEvent.META_SHIFT_ON, ) + private val ShortcutsWithDiffSizeOfKeys = + KeyboardShortcutInfo( + /* label = */ "Shortcuts with diff size of keys", + /* keycode = */ KeyEvent.KEYCODE_HOME, + /* modifiers = */ 0, + ) + + private val ShortcutsWithDiffSizeOfKeys2 = + KeyboardShortcutInfo( + /* label = */ ShortcutsWithDiffSizeOfKeys.label, + /* keycode = */ KeyEvent.KEYCODE_1, + /* modifiers = */ META_META_ON, + ) + + private val ShortcutsWithDiffSizeOfKeys3 = + KeyboardShortcutInfo( + /* label = */ ShortcutsWithDiffSizeOfKeys.label, + /* keycode = */ KeyEvent.KEYCODE_2, + /* modifiers = */ META_META_ON or META_FUNCTION_ON, + ) + private val shortcutWithGroupedRepeatedLabel = shortcut(shortcutInfoWithRepeatedLabel.label!!.toString()) { command { @@ -105,9 +126,44 @@ object TestShortcuts { KeyboardShortcutInfo( /* label = */ "Standard shortcut 1", /* keycode = */ KeyEvent.KEYCODE_N, - /* modifiers = */ KeyEvent.META_META_ON, + /* modifiers = */ META_META_ON, + ) + + const val CYCLE_FORWARD_THROUGH_RECENT_APPS_SHORTCUT_LABEL = "Cycle forward through recent apps" + const val CYCLE_BACK_THROUGH_RECENT_APPS_SHORTCUT_LABEL = "Cycle backward through recent apps" + + private val recentAppsCycleForwardShortcutInfo = + KeyboardShortcutInfo( + /* label = */ CYCLE_FORWARD_THROUGH_RECENT_APPS_SHORTCUT_LABEL, + /* keycode = */ KeyEvent.KEYCODE_N, + /* modifiers = */ META_META_ON, ) + private val recentAppsCycleBackShortcutInfo = + KeyboardShortcutInfo( + /* label = */ CYCLE_BACK_THROUGH_RECENT_APPS_SHORTCUT_LABEL, + /* keycode = */ KeyEvent.KEYCODE_N, + /* modifiers = */ META_META_ON, + ) + + private val recentAppsCycleForwardShortcut = + shortcut(recentAppsCycleForwardShortcutInfo.label!!.toString()) { + command { + key(R.drawable.ic_ksh_key_meta) + key("N") + } + isCustomizable = false + } + + private val recentAppsCycleBackShortcut = + shortcut(recentAppsCycleBackShortcutInfo.label!!.toString()) { + command { + key(R.drawable.ic_ksh_key_meta) + key("N") + } + isCustomizable = false + } + private val standardShortcut1 = shortcut(standardShortcutInfo1.label!!.toString()) { command { @@ -165,7 +221,7 @@ object TestShortcuts { KeyboardShortcutInfo( /* label = */ "Shortcut with unsupported modifiers", /* keycode = */ KeyEvent.KEYCODE_A, - /* modifiers = */ KeyEvent.META_META_ON or KeyEvent.KEYCODE_SPACE, + /* modifiers = */ META_META_ON or KeyEvent.KEYCODE_SPACE, ) private val groupWithRepeatedShortcutLabels = @@ -241,6 +297,12 @@ object TestShortcuts { listOf(standardShortcut3), ) + val recentAppsGroup = + KeyboardShortcutGroup( + "Recent apps", + listOf(recentAppsCycleForwardShortcutInfo, recentAppsCycleBackShortcutInfo), + ) + private val standardGroup1 = KeyboardShortcutGroup( "Standard group 1", @@ -259,6 +321,12 @@ object TestShortcuts { private val standardSystemAppSubcategoryWithCustomHomeShortcut = ShortcutSubCategory("System controls", listOf(customGoHomeShortcut)) + private val recentAppsSubCategory = + ShortcutSubCategory( + recentAppsGroup.label!!.toString(), + listOf(recentAppsCycleForwardShortcut, recentAppsCycleBackShortcut), + ) + private val standardSubCategory1 = ShortcutSubCategory( standardGroup1.label!!.toString(), @@ -354,6 +422,9 @@ object TestShortcuts { ), ) + val multitaskingCategoryWithRecentAppsGroup = + ShortcutCategory(type = MultiTasking, subCategories = listOf(recentAppsSubCategory)) + val multitaskingGroups = listOf(standardGroup2, standardGroup1) val multitaskingCategory = ShortcutCategory( @@ -381,6 +452,16 @@ object TestShortcuts { groupWithSupportedAndUnsupportedModifierShortcut, ) + val groupWithDifferentSizeOfShortcutKeys = + KeyboardShortcutGroup( + "Group with different size of shortcut keys", + listOf( + ShortcutsWithDiffSizeOfKeys3, + ShortcutsWithDiffSizeOfKeys, + ShortcutsWithDiffSizeOfKeys2, + ), + ) + val subCategoriesWithUnsupportedModifiersRemoved = listOf(subCategoryWithStandardShortcut, subCategoryWithUnsupportedShortcutsRemoved) @@ -408,6 +489,7 @@ object TestShortcuts { category: ShortcutCategoryType, subcategoryLabel: String, shortcutLabel: String, + includeInCustomization: Boolean = true, ): ShortcutCategory { return ShortcutCategory( type = category, @@ -415,13 +497,13 @@ object TestShortcuts { listOf( ShortcutSubCategory( label = subcategoryLabel, - shortcuts = listOf(simpleShortcut(shortcutLabel)), + shortcuts = listOf(simpleShortcut(shortcutLabel, includeInCustomization)), ) ), ) } - private fun simpleShortcut(label: String) = + private fun simpleShortcut(label: String, includeInCustomization: Boolean = true) = Shortcut( label = label, commands = @@ -436,6 +518,7 @@ object TestShortcuts { ), ) ), + isCustomizable = includeInCustomization, ) val customizableInputGestureWithUnknownKeyGestureType = @@ -662,7 +745,7 @@ object TestShortcuts { val standardAddShortcutRequest = ShortcutCustomizationRequestInfo.Add( label = "Standard shortcut", - categoryType = ShortcutCategoryType.System, + categoryType = System, subCategoryLabel = "Standard subcategory", ) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractorTest.kt index c3cedba65340..8f0bc640f0eb 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractorTest.kt @@ -369,6 +369,20 @@ class ShortcutHelperCategoriesInteractorTest : SysuiTestCase() { } } + @Test + fun categories_showShortcutsInAscendingOrderOfKeySize() = + testScope.runTest { + systemShortcutsSource.setGroups(TestShortcuts.groupWithDifferentSizeOfShortcutKeys) + val categories by collectLastValue(interactor.shortcutCategories) + + helper.showFromActivity() + + val systemCategoryShortcuts = categories?.get(0)?.subCategories?.get(0)?.shortcuts + val shortcutKeyCount = + systemCategoryShortcuts?.flatMap { it.commands }?.map { it.keys.size } + assertThat(shortcutKeyCount).containsExactly(1, 2, 3).inOrder() + } + private fun setCustomInputGestures(customInputGestures: List<InputGestureData>) { whenever(fakeInputManager.inputManager.getCustomInputGestures(/* filter= */ anyOrNull())) .thenReturn(customInputGestures) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt index 2d05ee0fe234..755c218f6789 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModelTest.kt @@ -108,7 +108,7 @@ class ShortcutCustomizationViewModelTest : SysuiTestCase() { viewModel.onShortcutCustomizationRequested(ShortcutCustomizationRequestInfo.Reset) val uiState by collectLastValue(viewModel.shortcutCustomizationUiState) - assertThat(uiState).isEqualTo(ResetShortcutDialog()) + assertThat(uiState).isEqualTo(ResetShortcutDialog) } } @@ -118,45 +118,7 @@ class ShortcutCustomizationViewModelTest : SysuiTestCase() { viewModel.onShortcutCustomizationRequested(allAppsShortcutDeleteRequest) val uiState by collectLastValue(viewModel.shortcutCustomizationUiState) - assertThat(uiState).isEqualTo(DeleteShortcutDialog()) - } - } - - @Test - fun uiState_consumedOnAddDialogShown() { - testScope.runTest { - val uiState by collectLastValue(viewModel.shortcutCustomizationUiState) - viewModel.onShortcutCustomizationRequested(standardAddShortcutRequest) - viewModel.onDialogShown() - - assertThat((uiState as AddShortcutDialog).isDialogShowing) - .isTrue() - } - } - - @Test - fun uiState_consumedOnDeleteDialogShown() { - testScope.runTest { - val uiState by collectLastValue(viewModel.shortcutCustomizationUiState) - viewModel.onShortcutCustomizationRequested(allAppsShortcutDeleteRequest) - viewModel.onDialogShown() - - assertThat( - (uiState as DeleteShortcutDialog).isDialogShowing - ) - .isTrue() - } - } - - @Test - fun uiState_consumedOnResetDialogShown() { - testScope.runTest { - val uiState by collectLastValue(viewModel.shortcutCustomizationUiState) - viewModel.onShortcutCustomizationRequested(ShortcutCustomizationRequestInfo.Reset) - viewModel.onDialogShown() - - assertThat((uiState as ResetShortcutDialog).isDialogShowing) - .isTrue() + assertThat(uiState).isEqualTo(DeleteShortcutDialog) } } @@ -165,7 +127,6 @@ class ShortcutCustomizationViewModelTest : SysuiTestCase() { testScope.runTest { val uiState by collectLastValue(viewModel.shortcutCustomizationUiState) viewModel.onShortcutCustomizationRequested(standardAddShortcutRequest) - viewModel.onDialogShown() viewModel.onDialogDismissed() assertThat(uiState).isEqualTo(ShortcutCustomizationUiState.Inactive) } @@ -199,7 +160,6 @@ class ShortcutCustomizationViewModelTest : SysuiTestCase() { testScope.runTest { val uiState by collectLastValue(viewModel.shortcutCustomizationUiState) viewModel.onShortcutCustomizationRequested(allAppsShortcutAddRequest) - viewModel.onDialogShown() assertThat((uiState as AddShortcutDialog).errorMessage) .isEmpty() @@ -339,7 +299,6 @@ class ShortcutCustomizationViewModelTest : SysuiTestCase() { private suspend fun openAddShortcutDialogAndSetShortcut() { viewModel.onShortcutCustomizationRequested(allAppsShortcutAddRequest) - viewModel.onDialogShown() viewModel.onKeyPressed(keyDownEventWithActionKeyPressed) viewModel.onKeyPressed(keyUpEventWithActionKeyPressed) @@ -349,14 +308,12 @@ class ShortcutCustomizationViewModelTest : SysuiTestCase() { private suspend fun openDeleteShortcutDialogAndDeleteShortcut() { viewModel.onShortcutCustomizationRequested(allAppsShortcutDeleteRequest) - viewModel.onDialogShown() viewModel.deleteShortcutCurrentlyBeingCustomized() } private suspend fun openResetShortcutDialogAndResetAllCustomShortcuts() { viewModel.onShortcutCustomizationRequested(ShortcutCustomizationRequestInfo.Reset) - viewModel.onDialogShown() viewModel.resetAllCustomShortcuts() } diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModelTest.kt index 3bd249689da9..78fce276a5f9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModelTest.kt @@ -18,6 +18,13 @@ package com.android.systemui.keyboard.shortcut.ui.viewmodel import android.app.role.RoleManager import android.app.role.mockRoleManager +import android.content.Context +import android.content.Context.INPUT_SERVICE +import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager +import android.content.pm.PackageManager.NameNotFoundException +import android.hardware.input.InputGestureData +import android.hardware.input.fakeInputManager import android.view.KeyEvent import android.view.KeyboardShortcutGroup import android.view.KeyboardShortcutInfo @@ -31,6 +38,7 @@ import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.keyboard.shortcut.data.source.FakeKeyboardShortcutGroupsSource import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts +import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts.allAppsInputGestureData import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategory import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategoryType.CurrentApp import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategoryType.MultiTasking @@ -56,7 +64,6 @@ import com.android.systemui.settings.FakeUserTracker import com.android.systemui.settings.fakeUserTracker import com.android.systemui.settings.userTracker import com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_SHORTCUT_HELPER_SHOWING -import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.UnconfinedTestDispatcher @@ -64,6 +71,10 @@ import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers.anyString +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever @OptIn(ExperimentalCoroutinesApi::class) @SmallTest @@ -73,6 +84,9 @@ class ShortcutHelperViewModelTest : SysuiTestCase() { private val fakeSystemSource = FakeKeyboardShortcutGroupsSource() private val fakeMultiTaskingSource = FakeKeyboardShortcutGroupsSource() private val fakeCurrentAppsSource = FakeKeyboardShortcutGroupsSource() + private val mockPackageManager: PackageManager = mock() + private val mockUserContext: Context = mock() + private val mockApplicationInfo: ApplicationInfo = mock() private val kosmos = Kosmos().also { @@ -83,7 +97,7 @@ class ShortcutHelperViewModelTest : SysuiTestCase() { it.shortcutHelperAppCategoriesShortcutsSource = FakeKeyboardShortcutGroupsSource() it.shortcutHelperInputShortcutsSource = FakeKeyboardShortcutGroupsSource() it.shortcutHelperCurrentAppShortcutsSource = fakeCurrentAppsSource - it.userTracker = FakeUserTracker(onCreateCurrentUserContext = { context }) + it.userTracker = FakeUserTracker(onCreateCurrentUserContext = { mockUserContext }) } private val testScope = kosmos.testScope @@ -91,13 +105,20 @@ class ShortcutHelperViewModelTest : SysuiTestCase() { private val sysUiState = kosmos.sysUiState private val fakeUserTracker = kosmos.fakeUserTracker private val mockRoleManager = kosmos.mockRoleManager + private val inputManager = kosmos.fakeInputManager.inputManager private val viewModel = kosmos.shortcutHelperViewModel + @Before fun setUp() { fakeSystemSource.setGroups(TestShortcuts.systemGroups) fakeMultiTaskingSource.setGroups(TestShortcuts.multitaskingGroups) fakeCurrentAppsSource.setGroups(TestShortcuts.currentAppGroups) + whenever(mockPackageManager.getApplicationInfo(anyString(), eq(0))).thenReturn(mockApplicationInfo) + whenever(mockPackageManager.getApplicationLabel(mockApplicationInfo)).thenReturn("Current App") + whenever(mockPackageManager.getApplicationIcon(anyString())).thenThrow(NameNotFoundException()) + whenever(mockUserContext.packageManager).thenReturn(mockPackageManager) + whenever(mockUserContext.getSystemService(INPUT_SERVICE)).thenReturn(inputManager) } @Test @@ -259,11 +280,11 @@ class ShortcutHelperViewModelTest : SysuiTestCase() { fun shortcutsUiState_currentAppIsLauncher_defaultSelectedCategoryIsSystem() = testScope.runTest { whenever( - mockRoleManager.getRoleHoldersAsUser( - RoleManager.ROLE_HOME, - fakeUserTracker.userHandle, - ) + mockRoleManager.getRoleHoldersAsUser( + RoleManager.ROLE_HOME, + fakeUserTracker.userHandle, ) + ) .thenReturn(listOf(TestShortcuts.currentAppPackageName)) val uiState by collectLastValue(viewModel.shortcutsUiState) @@ -299,23 +320,23 @@ class ShortcutHelperViewModelTest : SysuiTestCase() { label = "System", iconSource = IconSource(imageVector = Icons.Default.Tv), shortcutCategory = - ShortcutCategory( - System, - subCategoryWithShortcutLabels("first Foo shortcut1"), - subCategoryWithShortcutLabels( - "second foO shortcut2", - subCategoryLabel = SECOND_SIMPLE_GROUP_LABEL, - ), + ShortcutCategory( + System, + subCategoryWithShortcutLabels("first Foo shortcut1"), + subCategoryWithShortcutLabels( + "second foO shortcut2", + subCategoryLabel = SECOND_SIMPLE_GROUP_LABEL, ), + ), ), ShortcutCategoryUi( label = "Multitasking", iconSource = IconSource(imageVector = Icons.Default.VerticalSplit), shortcutCategory = - ShortcutCategory( - MultiTasking, - subCategoryWithShortcutLabels("third FoO shortcut1"), - ), + ShortcutCategory( + MultiTasking, + subCategoryWithShortcutLabels("third FoO shortcut1"), + ), ), ) } @@ -387,6 +408,31 @@ class ShortcutHelperViewModelTest : SysuiTestCase() { assertThat(activeUiState.defaultSelectedCategory).isInstanceOf(CurrentApp::class.java) } + @Test + fun shortcutsUiState_shouldShowResetButton_isFalseWhenThereAreNoCustomShortcuts() = + testScope.runTest { + val uiState by collectLastValue(viewModel.shortcutsUiState) + + testHelper.showFromActivity() + + val activeUiState = uiState as ShortcutsUiState.Active + assertThat(activeUiState.shouldShowResetButton).isFalse() + } + + @Test + fun shortcutsUiState_shouldShowResetButton_isTrueWhenThereAreCustomShortcuts() = + testScope.runTest { + whenever( + inputManager.getCustomInputGestures(/* filter= */ InputGestureData.Filter.KEY) + ).thenReturn(listOf(allAppsInputGestureData)) + val uiState by collectLastValue(viewModel.shortcutsUiState) + + testHelper.showFromActivity() + + val activeUiState = uiState as ShortcutsUiState.Active + assertThat(activeUiState.shouldShowResetButton).isTrue() + } + private fun groupWithShortcutLabels( vararg shortcutLabels: String, groupLabel: String = FIRST_SIMPLE_GROUP_LABEL, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt index 74a0bafda931..df4d5ab90f5e 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/binder/WindowManagerLockscreenVisibilityManagerTest.kt @@ -195,6 +195,7 @@ class WindowManagerLockscreenVisibilityManagerTest : SysuiTestCase() { @RequiresFlagsEnabled(Flags.FLAG_ENSURE_KEYGUARD_DOES_TRANSITION_STARTING) fun setSurfaceBehindVisibility_goesAwayFirst_andIgnoresSecondCall_with_keyguard_shell_transitions() { underTest.setLockscreenShown(true) + verify(keyguardTransitions).startKeyguardTransition(true, false) underTest.setSurfaceBehindVisibility(true) verify(keyguardTransitions).startKeyguardTransition(false, false) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt index 62cc76345c87..97e67634cd2b 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenUserActionsViewModelTest.kt @@ -306,8 +306,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { // Top edge is not applicable in dual shade, as well as two-finger swipe. assertThat(downDestination).isNull() } else { - assertThat(downDestination) - .isEqualTo(ShowOverlay(Overlays.NotificationsShade, isIrreversible = true)) + assertThat(downDestination).isEqualTo(ShowOverlay(Overlays.NotificationsShade)) assertThat(downDestination?.transitionKey).isNull() } @@ -323,7 +322,7 @@ class LockscreenUserActionsViewModelTest : SysuiTestCase() { downWithTwoPointers -> assertThat(downFromTopRightDestination).isNull() else -> { assertThat(downFromTopRightDestination) - .isEqualTo(ShowOverlay(Overlays.QuickSettingsShade, isIrreversible = true)) + .isEqualTo(ShowOverlay(Overlays.QuickSettingsShade)) assertThat(downFromTopRightDestination?.transitionKey).isNull() } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/kosmos/GeneralKosmosTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/kosmos/GeneralKosmosTest.kt new file mode 100644 index 000000000000..49e553b56554 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/kosmos/GeneralKosmosTest.kt @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.kosmos + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +class GeneralKosmosTest : SysuiTestCase() { + @Test + fun stateCurrentValueMutableStateFlow() = runTest { + val source = MutableStateFlow(1) + val mapped = + source + .map { it * 2 } + .stateIn( + scope = backgroundScope, + started = SharingStarted.WhileSubscribed(), + initialValue = source.value * 2, + ) + assertThat(currentValue(mapped)).isEqualTo(2) + + source.value = 3 + assertThat(currentValue(mapped)).isEqualTo(6) + } + + @Test + fun stateCurrentValueOnEmittedFlow() = runTest { + val source = flow { + emit(1) + emit(2) + } + val mapped = + source + .map { it * 2 } + .stateIn( + scope = backgroundScope, + started = SharingStarted.WhileSubscribed(), + initialValue = 2, + ) + assertThat(currentValue(mapped)).isEqualTo(4) + } + + @Test + fun currentValueIsNull() = runTest { + val source = MutableStateFlow<Int?>(null) + assertThat(currentValue(source)).isEqualTo(null) + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModelTest.kt index 01220285e10c..9edd62a8a784 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModelTest.kt @@ -99,14 +99,14 @@ class MediaControlViewModelTest : SysuiTestCase() { assertThat(playerModel).isNotNull() assertThat(playerModel?.titleName).isEqualTo(TITLE) assertThat(playerModel?.artistName).isEqualTo(ARTIST) - assertThat(underTest.isNewPlayer(playerModel!!)).isTrue() + assertThat(underTest.setPlayer(playerModel!!)).isTrue() mediaDataFilter.onMediaDataLoaded(KEY, KEY, mediaData) assertThat(playerModel).isNotNull() assertThat(playerModel?.titleName).isEqualTo(TITLE) assertThat(playerModel?.artistName).isEqualTo(ARTIST) - assertThat(underTest.isNewPlayer(playerModel!!)).isFalse() + assertThat(underTest.setPlayer(playerModel!!)).isFalse() } @Test @@ -120,7 +120,7 @@ class MediaControlViewModelTest : SysuiTestCase() { assertThat(playerModel).isNotNull() assertThat(playerModel?.titleName).isEqualTo(TITLE) assertThat(playerModel?.artistName).isEqualTo(ARTIST) - assertThat(underTest.isNewPlayer(playerModel!!)).isTrue() + assertThat(underTest.setPlayer(playerModel!!)).isTrue() mediaData = initMediaData(ARTIST_2, TITLE_2) @@ -129,7 +129,7 @@ class MediaControlViewModelTest : SysuiTestCase() { assertThat(playerModel).isNotNull() assertThat(playerModel?.titleName).isEqualTo(TITLE_2) assertThat(playerModel?.artistName).isEqualTo(ARTIST_2) - assertThat(underTest.isNewPlayer(playerModel!!)).isTrue() + assertThat(underTest.setPlayer(playerModel!!)).isTrue() } private fun initMediaData(artist: String, title: String): MediaData { diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt index 77be8c718b14..6ec38ba171c3 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt @@ -16,8 +16,9 @@ package com.android.systemui.mediarouter.data.repository -import androidx.test.filters.SmallTest +import android.media.projection.StopReason import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue import com.android.systemui.kosmos.Kosmos @@ -101,7 +102,7 @@ class MediaRouterRepositoryTest : SysuiTestCase() { origin = CastDevice.CastOrigin.MediaRouter, ) - underTest.stopCasting(device) + underTest.stopCasting(device, StopReason.STOP_UNKNOWN) assertThat(castController.lastStoppedDevice).isEqualTo(device) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/external/TileServiceRequestControllerTestComposeOn.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/external/TileServiceRequestControllerTestComposeOn.kt new file mode 100644 index 000000000000..f02856c2f5ae --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/external/TileServiceRequestControllerTestComposeOn.kt @@ -0,0 +1,276 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external + +import android.app.Dialog +import android.app.StatusBarManager +import android.content.ComponentName +import android.content.DialogInterface +import android.graphics.drawable.Icon +import android.platform.test.annotations.EnableFlags +import android.view.WindowManager +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.internal.statusbar.IAddTileResultCallback +import com.android.systemui.SysuiTestCase +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.runCurrent +import com.android.systemui.kosmos.runTest +import com.android.systemui.qs.external.ui.dialog.FakeTileRequestDialogComposeDelegateFactory +import com.android.systemui.qs.external.ui.dialog.fake +import com.android.systemui.qs.external.ui.dialog.tileRequestDialogComposeDelegateFactory +import com.android.systemui.qs.flags.QSComposeFragment +import com.android.systemui.qs.pipeline.data.repository.fakeInstalledTilesRepository +import com.android.systemui.qs.pipeline.domain.interactor.currentTilesInteractor +import com.android.systemui.qs.pipeline.shared.TileSpec +import com.android.systemui.runOnMainThreadAndWaitForIdleSync +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import java.util.function.Consumer +import kotlin.test.Test +import org.junit.Before +import org.junit.runner.RunWith +import org.mockito.kotlin.mock + +@SmallTest +@RunWith(AndroidJUnit4::class) +@EnableFlags(QSComposeFragment.FLAG_NAME) +class TileServiceRequestControllerTestComposeOn : SysuiTestCase() { + private val kosmos = testKosmos() + + private val userId: Int + get() = kosmos.currentTilesInteractor.userId.value + + private val mockIcon: Icon + get() = mock() + + private val Kosmos.underTest by Kosmos.Fixture { tileServiceRequestController } + + @Before + fun setup() { + kosmos.fakeInstalledTilesRepository.setInstalledPackagesForUser( + userId, + setOf(TEST_COMPONENT), + ) + // Start with some tiles, so adding tiles is possible (adding tiles waits until there's + // at least one tile, to wait for setup). + kosmos.currentTilesInteractor.setTiles(listOf(TileSpec.create("a"))) + kosmos.runCurrent() + } + + @Test + fun tileAlreadyAdded_correctResult() = + kosmos.runTest { + // An existing tile + currentTilesInteractor.setTiles(listOf(TILE_SPEC)) + runCurrent() + + val callback = Callback() + runOnMainThreadAndWaitForIdleSync { + val dialog = + underTest.requestTileAdd( + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + mockIcon, + callback, + ) + assertThat(dialog).isNull() + } + + assertThat(callback.lastAccepted).isEqualTo(TILE_ALREADY_ADDED) + assertThat(currentTilesInteractor.currentTilesSpecs.count { it == TILE_SPEC }) + .isEqualTo(1) + } + + @Test + fun cancelDialog_dismissResult_tileNotAdded() = + kosmos.runTest { + val callback = Callback() + val dialog = runOnMainThreadAndWaitForIdleSync { + underTest.requestTileAdd( + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + mockIcon, + callback, + )!! + } + + runOnMainThreadAndWaitForIdleSync { dialog.cancel() } + + assertThat(callback.lastAccepted).isEqualTo(DISMISSED) + assertThat(currentTilesInteractor.currentTilesSpecs).doesNotContain(TILE_SPEC) + } + + @Test + fun cancelAndThenDismissSendsOnlyOnce() = + kosmos.runTest { + // After cancelling, the dialog is dismissed. This tests that only one response + // is sent. + val callback = Callback() + val dialog = runOnMainThreadAndWaitForIdleSync { + underTest.requestTileAdd( + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + mockIcon, + callback, + )!! + } + + runOnMainThreadAndWaitForIdleSync { + dialog.cancel() + dialog.dismiss() + } + + assertThat(callback.lastAccepted).isEqualTo(DISMISSED) + assertThat(callback.timesCalled).isEqualTo(1) + } + + @Test + fun showAllUsers_set() = + kosmos.runTest { + val dialog = runOnMainThreadAndWaitForIdleSync { + underTest.requestTileAdd( + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + mockIcon, + Callback(), + )!! + } + onTeardown { dialog.cancel() } + + assertThat(dialog.isShowForAllUsers).isTrue() + } + + @Test + fun cancelOnTouchOutside_set() = + kosmos.runTest { + val dialog = runOnMainThreadAndWaitForIdleSync { + underTest.requestTileAdd( + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + mockIcon, + Callback(), + )!! + } + onTeardown { dialog.cancel() } + + assertThat(dialog.isCancelOnTouchOutside).isTrue() + } + + @Test + fun positiveAction_tileAdded() = + kosmos.runTest { + // Not using a real dialog + tileRequestDialogComposeDelegateFactory = FakeTileRequestDialogComposeDelegateFactory() + + val callback = Callback() + val dialog = + underTest.requestTileAdd( + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + mockIcon, + callback, + ) + + tileRequestDialogComposeDelegateFactory.fake.clickListener.onClick( + dialog, + DialogInterface.BUTTON_POSITIVE, + ) + runCurrent() + + assertThat(callback.lastAccepted).isEqualTo(ADD_TILE) + assertThat(currentTilesInteractor.currentTilesSpecs).hasSize(2) + assertThat(currentTilesInteractor.currentTilesSpecs.last()).isEqualTo(TILE_SPEC) + } + + @Test + fun negativeAction_tileNotAdded() = + kosmos.runTest { + // Not using a real dialog + tileRequestDialogComposeDelegateFactory = FakeTileRequestDialogComposeDelegateFactory() + + val callback = Callback() + val dialog = + underTest.requestTileAdd( + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + mockIcon, + callback, + ) + + tileRequestDialogComposeDelegateFactory.fake.clickListener.onClick( + dialog, + DialogInterface.BUTTON_NEGATIVE, + ) + runCurrent() + + assertThat(callback.lastAccepted).isEqualTo(DONT_ADD_TILE) + assertThat(currentTilesInteractor.currentTilesSpecs).doesNotContain(TILE_SPEC) + } + + companion object { + private val TEST_COMPONENT = ComponentName("test_pkg", "test_cls") + private val TILE_SPEC = TileSpec.create(TEST_COMPONENT) + private const val TEST_APP_NAME = "App" + private const val TEST_LABEL = "Label" + private const val TEST_UID = 12345 + + const val ADD_TILE = StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ADDED + const val DONT_ADD_TILE = StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_NOT_ADDED + const val TILE_ALREADY_ADDED = StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ALREADY_ADDED + const val DISMISSED = StatusBarManager.TILE_ADD_REQUEST_RESULT_DIALOG_DISMISSED + } + + private class Callback : IAddTileResultCallback.Stub(), Consumer<Int> { + var lastAccepted: Int? = null + private set + + var timesCalled = 0 + private set + + override fun accept(t: Int) { + lastAccepted = t + timesCalled++ + } + + override fun onTileRequest(r: Int) { + accept(r) + } + } +} + +private val Dialog.isShowForAllUsers: Boolean + get() = + window!!.attributes.privateFlags and + WindowManager.LayoutParams.SYSTEM_FLAG_SHOW_FOR_ALL_USERS != 0 + +private val Dialog.isCancelOnTouchOutside: Boolean + get() = window!!.shouldCloseOnTouchOutside() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModelTest.kt new file mode 100644 index 000000000000..369975a95579 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModelTest.kt @@ -0,0 +1,150 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external.ui.viewmodel + +import android.content.applicationContext +import android.content.res.mainResources +import android.graphics.drawable.Icon +import android.graphics.drawable.TestStubDrawable +import android.service.quicksettings.Tile +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.app.iUriGrantsManager +import com.android.systemui.SysuiTestCase +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.runCurrent +import com.android.systemui.kosmos.runTest +import com.android.systemui.kosmos.testScope +import com.android.systemui.lifecycle.activateIn +import com.android.systemui.plugins.qs.QSTile +import com.android.systemui.qs.external.TileData +import com.android.systemui.qs.panels.ui.viewmodel.toUiState +import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.qs.tileimpl.QSTileImpl.ResourceIcon +import com.android.systemui.res.R +import com.android.systemui.testKosmos +import com.google.common.truth.Expect +import com.google.common.truth.Truth.assertThat +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.doReturn +import org.mockito.kotlin.mock +import org.mockito.kotlin.stub + +@SmallTest +@RunWith(AndroidJUnit4::class) +class TileRequestDialogViewModelTest : SysuiTestCase() { + + @get:Rule val expect: Expect = Expect.create() + + private val kosmos = testKosmos() + + private val icon: Icon = mock { + on { + loadDrawableCheckingUriGrant( + kosmos.applicationContext, + kosmos.iUriGrantsManager, + TEST_UID, + TEST_PACKAGE, + ) + } doReturn (loadedDrawable) + } + + private val tileData = TileData(TEST_UID, TEST_APP_NAME, TEST_LABEL, icon, TEST_PACKAGE) + + private val Kosmos.underTest by + Kosmos.Fixture { tileRequestDialogViewModelFactory.create(applicationContext, tileData) } + + private val baseResultLegacyState = + QSTile.State().apply { + label = TEST_LABEL + state = Tile.STATE_ACTIVE + handlesLongClick = false + } + + @Test + fun uiState_beforeActivation_hasDefaultIcon_andCorrectData() = + kosmos.runTest { + val expectedState = + baseResultLegacyState.apply { icon = defaultIcon }.toUiState(mainResources) + + with(underTest.uiState) { + expect.that(label).isEqualTo(TEST_LABEL) + expect.that(secondaryLabel).isEmpty() + expect.that(state).isEqualTo(expectedState.state) + expect.that(handlesLongClick).isFalse() + expect.that(handlesSecondaryClick).isFalse() + expect.that(icon.get()).isEqualTo(defaultIcon) + expect.that(sideDrawable).isNull() + expect.that(accessibilityUiState).isEqualTo(expectedState.accessibilityUiState) + } + } + + @Test + fun uiState_afterActivation_hasCorrectIcon_andCorrectData() = + kosmos.runTest { + val expectedState = + baseResultLegacyState + .apply { icon = QSTileImpl.DrawableIcon(loadedDrawable) } + .toUiState(mainResources) + + underTest.activateIn(testScope) + runCurrent() + + with(underTest.uiState) { + expect.that(label).isEqualTo(TEST_LABEL) + expect.that(secondaryLabel).isEmpty() + expect.that(state).isEqualTo(expectedState.state) + expect.that(handlesLongClick).isFalse() + expect.that(handlesSecondaryClick).isFalse() + expect.that(icon.get()).isEqualTo(QSTileImpl.DrawableIcon(loadedDrawable)) + expect.that(sideDrawable).isNull() + expect.that(accessibilityUiState).isEqualTo(expectedState.accessibilityUiState) + } + } + + @Test + fun uiState_afterActivation_iconNotLoaded_usesDefault() = + kosmos.runTest { + icon.stub { + on { + loadDrawableCheckingUriGrant( + kosmos.applicationContext, + kosmos.iUriGrantsManager, + TEST_UID, + TEST_PACKAGE, + ) + } doReturn (null) + } + + underTest.activateIn(testScope) + runCurrent() + + assertThat(underTest.uiState.icon.get()).isEqualTo(defaultIcon) + } + + companion object { + private val defaultIcon: QSTile.Icon = ResourceIcon.get(R.drawable.android) + private val loadedDrawable = TestStubDrawable("loaded") + + private const val TEST_PACKAGE = "test_pkg" + private const val TEST_APP_NAME = "App" + private const val TEST_LABEL = "Label" + private const val TEST_UID = 12345 + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt index ee2a1d56937b..411960f5be71 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest_311121830.kt @@ -16,7 +16,6 @@ package com.android.systemui.qs.tileimpl -import android.animation.AnimatorTestRule import android.content.Context import android.service.quicksettings.Tile import android.view.ContextThemeWrapper @@ -26,6 +25,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.annotation.UiThreadTest import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase +import com.android.systemui.animation.AnimatorTestRule import com.android.systemui.plugins.qs.QSTile import com.android.systemui.res.R import com.android.systemui.statusbar.connectivity.WifiIcons @@ -77,7 +77,7 @@ class QSIconViewImplTest_311121830 : SysuiTestCase() { // Set the second state to animate (it shouldn't, because `State.state` is the same) and // advance time to 2 animations length iconView.setIcon(secondState, /* allowAnimations= */ true) - animatorRule.advanceTimeBy(QSIconViewImpl.QS_ANIM_LENGTH * 2) + animatorRule.advanceAnimationDuration(QSIconViewImpl.QS_ANIM_LENGTH * 2) assertThat(iconView.mLastIcon).isEqualTo(secondState.icon) } @@ -126,7 +126,7 @@ class QSIconViewImplTest_311121830 : SysuiTestCase() { // Set the third state to animate and advance time by two times the animation length // to guarantee that all animations are done iconView.setIcon(thirdState, /* allowAnimations= */ true) - animatorRule.advanceTimeBy(QSIconViewImpl.QS_ANIM_LENGTH * 2) + animatorRule.advanceAnimationDuration(QSIconViewImpl.QS_ANIM_LENGTH * 2) assertThat(iconView.mLastIcon).isEqualTo(thirdState.icon) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/CastTileTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/CastTileTest.java index 9f12b189d76a..31a627fe0667 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/CastTileTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/CastTileTest.java @@ -20,6 +20,7 @@ import static junit.framework.Assert.assertTrue; import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertFalse; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; @@ -30,6 +31,7 @@ import static org.mockito.Mockito.when; import android.media.MediaRouter; import android.media.MediaRouter.RouteInfo; import android.media.projection.MediaProjectionInfo; +import android.media.projection.StopReason; import android.os.Handler; import android.service.quicksettings.Tile; import android.testing.TestableLooper; @@ -336,7 +338,8 @@ public class CastTileTest extends SysuiTestCase { mCastTile.handleClick(null /* view */); mTestableLooper.processAllMessages(); - verify(mController, times(1)).stopCasting(same(device)); + verify(mController, times(1)) + .stopCasting(same(device), eq(StopReason.STOP_QS_TILE)); } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt index 940da9967a68..33748b973f1c 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt @@ -27,7 +27,6 @@ import androidx.lifecycle.LifecycleOwner import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.internal.logging.MetricsLogger -import com.android.systemui.res.R import com.android.systemui.SysuiTestCase import com.android.systemui.animation.ActivityTransitionAnimator import com.android.systemui.classifier.FalsingManagerFake @@ -45,13 +44,14 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.qs.QSHost import com.android.systemui.qs.QsEventLogger import com.android.systemui.qs.logging.QSLogger -import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.res.R import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.capture import com.android.systemui.util.mockito.eq import com.android.systemui.util.settings.FakeSettings import com.android.systemui.util.settings.SecureSettings import com.google.common.truth.Truth.assertThat +import java.util.Optional import org.junit.After import org.junit.Before import org.junit.Test @@ -67,40 +67,27 @@ import org.mockito.Mockito.verify import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations -import java.util.Optional @SmallTest @RunWith(AndroidJUnit4::class) @TestableLooper.RunWithLooper(setAsMainLooper = true) class DeviceControlsTileTest : SysuiTestCase() { - @Mock - private lateinit var qsHost: QSHost - @Mock - private lateinit var metricsLogger: MetricsLogger - @Mock - private lateinit var statusBarStateController: StatusBarStateController - @Mock - private lateinit var activityStarter: ActivityStarter - @Mock - private lateinit var qsLogger: QSLogger - @Mock - private lateinit var controlsComponent: ControlsComponent - @Mock - private lateinit var controlsUiController: ControlsUiController - @Mock - private lateinit var controlsListingController: ControlsListingController - @Mock - private lateinit var controlsController: ControlsController - @Mock - private lateinit var serviceInfo: ControlsServiceInfo - @Mock - private lateinit var uiEventLogger: QsEventLogger + @Mock private lateinit var qsHost: QSHost + @Mock private lateinit var metricsLogger: MetricsLogger + @Mock private lateinit var statusBarStateController: StatusBarStateController + @Mock private lateinit var activityStarter: ActivityStarter + @Mock private lateinit var qsLogger: QSLogger + @Mock private lateinit var controlsComponent: ControlsComponent + @Mock private lateinit var controlsUiController: ControlsUiController + @Mock private lateinit var controlsListingController: ControlsListingController + @Mock private lateinit var controlsController: ControlsController + @Mock private lateinit var serviceInfo: ControlsServiceInfo + @Mock private lateinit var uiEventLogger: QsEventLogger @Captor private lateinit var listingCallbackCaptor: - ArgumentCaptor<ControlsListingController.ControlsListingCallback> - @Captor - private lateinit var intentCaptor: ArgumentCaptor<Intent> + ArgumentCaptor<ControlsListingController.ControlsListingCallback> + @Captor private lateinit var intentCaptor: ArgumentCaptor<Intent> private lateinit var testableLooper: TestableLooper private lateinit var tile: DeviceControlsTile @@ -120,8 +107,11 @@ class DeviceControlsTileTest : SysuiTestCase() { `when`(qsHost.context).thenReturn(spiedContext) `when`(controlsComponent.isEnabled()).thenReturn(true) `when`(controlsController.getPreferredSelection()) - .thenReturn(SelectedItem.StructureItem( - StructureInfo(ComponentName("pkg", "cls"), "structure", listOf()))) + .thenReturn( + SelectedItem.StructureItem( + StructureInfo(ComponentName("pkg", "cls"), "structure", listOf()) + ) + ) secureSettings.putInt(Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, 1) setupControlsComponent() @@ -182,10 +172,11 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun testObservingCallback() { - verify(controlsListingController).observe( + verify(controlsListingController) + .observe( any(LifecycleOwner::class.java), - any(ControlsListingController.ControlsListingCallback::class.java) - ) + any(ControlsListingController.ControlsListingCallback::class.java), + ) } @Test @@ -205,10 +196,8 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun testStateUnavailableIfNoListings() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) listingCallbackCaptor.value.onServicesUpdated(emptyList()) testableLooper.processAllMessages() @@ -218,10 +207,8 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun testStateUnavailableIfNotEnabled() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) `when`(controlsComponent.isEnabled()).thenReturn(false) listingCallbackCaptor.value.onServicesUpdated(listOf(serviceInfo)) @@ -232,18 +219,19 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun testStateActiveIfListingsHasControlsFavorited() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) `when`(controlsComponent.getVisibility()).thenReturn(ControlsComponent.Visibility.AVAILABLE) - `when`(controlsController.getPreferredSelection()).thenReturn( - SelectedItem.StructureItem(StructureInfo( - ComponentName("pkg", "cls"), - "structure", - listOf(ControlInfo("id", "title", "subtitle", 1)) - )) - ) + `when`(controlsController.getPreferredSelection()) + .thenReturn( + SelectedItem.StructureItem( + StructureInfo( + ComponentName("pkg", "cls"), + "structure", + listOf(ControlInfo("id", "title", "subtitle", 1)), + ) + ) + ) listingCallbackCaptor.value.onServicesUpdated(listOf(serviceInfo)) testableLooper.processAllMessages() @@ -253,14 +241,15 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun testStateInactiveIfListingsHasNoControlsFavorited() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) `when`(controlsComponent.getVisibility()).thenReturn(ControlsComponent.Visibility.AVAILABLE) `when`(controlsController.getPreferredSelection()) - .thenReturn(SelectedItem.StructureItem( - StructureInfo(ComponentName("pkg", "cls"), "structure", listOf()))) + .thenReturn( + SelectedItem.StructureItem( + StructureInfo(ComponentName("pkg", "cls"), "structure", listOf()) + ) + ) listingCallbackCaptor.value.onServicesUpdated(listOf(serviceInfo)) testableLooper.processAllMessages() @@ -270,13 +259,11 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun testStateActiveIfPreferredIsPanel() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) `when`(controlsComponent.getVisibility()).thenReturn(ControlsComponent.Visibility.AVAILABLE) `when`(controlsController.getPreferredSelection()) - .thenReturn(SelectedItem.PanelItem("appName", ComponentName("pkg", "cls"))) + .thenReturn(SelectedItem.PanelItem("appName", ComponentName("pkg", "cls"))) listingCallbackCaptor.value.onServicesUpdated(listOf(serviceInfo)) testableLooper.processAllMessages() @@ -286,10 +273,8 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun testStateInactiveIfLocked() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) `when`(controlsComponent.getVisibility()) .thenReturn(ControlsComponent.Visibility.AVAILABLE_AFTER_UNLOCK) @@ -301,10 +286,8 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun testMoveBetweenStates() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) listingCallbackCaptor.value.onServicesUpdated(listOf(serviceInfo)) testableLooper.processAllMessages() @@ -325,19 +308,20 @@ class DeviceControlsTileTest : SysuiTestCase() { @Test fun handleClick_available_shownOverLockscreenWhenLocked() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) `when`(controlsComponent.getVisibility()).thenReturn(ControlsComponent.Visibility.AVAILABLE) `when`(controlsUiController.resolveActivity()).thenReturn(ControlsActivity::class.java) - `when`(controlsController.getPreferredSelection()).thenReturn( - SelectedItem.StructureItem(StructureInfo( - ComponentName("pkg", "cls"), - "structure", - listOf(ControlInfo("id", "title", "subtitle", 1)) - )) - ) + `when`(controlsController.getPreferredSelection()) + .thenReturn( + SelectedItem.StructureItem( + StructureInfo( + ComponentName("pkg", "cls"), + "structure", + listOf(ControlInfo("id", "title", "subtitle", 1)), + ) + ) + ) listingCallbackCaptor.value.onServicesUpdated(listOf(serviceInfo)) testableLooper.processAllMessages() @@ -345,30 +329,33 @@ class DeviceControlsTileTest : SysuiTestCase() { tile.click(null /* view */) testableLooper.processAllMessages() - verify(activityStarter).startActivity( + verify(activityStarter) + .startActivity( intentCaptor.capture(), eq(true) /* dismissShade */, nullable(ActivityTransitionAnimator.Controller::class.java), - eq(true) /* showOverLockscreenWhenLocked */) + eq(true), /* showOverLockscreenWhenLocked */ + ) assertThat(intentCaptor.value.component?.className).isEqualTo(CONTROLS_ACTIVITY_CLASS_NAME) } @Test fun handleClick_availableAfterUnlock_notShownOverLockscreenWhenLocked() { - verify(controlsListingController).observe( - any(LifecycleOwner::class.java), - capture(listingCallbackCaptor) - ) + verify(controlsListingController) + .observe(any(LifecycleOwner::class.java), capture(listingCallbackCaptor)) `when`(controlsComponent.getVisibility()) .thenReturn(ControlsComponent.Visibility.AVAILABLE_AFTER_UNLOCK) `when`(controlsUiController.resolveActivity()).thenReturn(ControlsActivity::class.java) - `when`(controlsController.getPreferredSelection()).thenReturn( - SelectedItem.StructureItem(StructureInfo( - ComponentName("pkg", "cls"), - "structure", - listOf(ControlInfo("id", "title", "subtitle", 1)) - )) - ) + `when`(controlsController.getPreferredSelection()) + .thenReturn( + SelectedItem.StructureItem( + StructureInfo( + ComponentName("pkg", "cls"), + "structure", + listOf(ControlInfo("id", "title", "subtitle", 1)), + ) + ) + ) listingCallbackCaptor.value.onServicesUpdated(listOf(serviceInfo)) testableLooper.processAllMessages() @@ -376,26 +363,19 @@ class DeviceControlsTileTest : SysuiTestCase() { tile.click(null /* view */) testableLooper.processAllMessages() - verify(activityStarter).startActivity( + verify(activityStarter) + .startActivity( intentCaptor.capture(), anyBoolean() /* dismissShade */, nullable(ActivityTransitionAnimator.Controller::class.java), - eq(false) /* showOverLockscreenWhenLocked */) + eq(false), /* showOverLockscreenWhenLocked */ + ) assertThat(intentCaptor.value.component?.className).isEqualTo(CONTROLS_ACTIVITY_CLASS_NAME) } @Test fun verifyTileEqualsResourceFromComponent() { - assertThat(tile.tileLabel) - .isEqualTo( - context.getText( - controlsComponent.getTileTitleId())) - } - - @Test - fun verifyTileImageEqualsResourceFromComponent() { - assertThat(tile.icon) - .isEqualTo(QSTileImpl.ResourceIcon.get(controlsComponent.getTileImageId())) + assertThat(tile.tileLabel).isEqualTo(context.getText(controlsComponent.getTileTitleId())) } private fun createTile(): DeviceControlsTile { @@ -409,11 +389,12 @@ class DeviceControlsTileTest : SysuiTestCase() { statusBarStateController, activityStarter, qsLogger, - controlsComponent - ).also { - it.initialize() - testableLooper.processAllMessages() - } + controlsComponent, + ) + .also { + it.initialize() + testableLooper.processAllMessages() + } } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileNewImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileNewImplTest.kt index 9f84e346d54a..f33de4d9144d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileNewImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileNewImplTest.kt @@ -128,7 +128,7 @@ class InternetTileNewImplTest : SysuiTestCase() { viewModel, dialogManager, wifiStateWorker, - accessPointController + accessPointController, ) underTest.initialize() @@ -156,10 +156,7 @@ class InternetTileNewImplTest : SysuiTestCase() { testScope.runTest { connectivityRepository.defaultConnections.value = DefaultConnectionModel() wifiRepository.wifiScanResults.value = - listOf( - WifiScanEntry(ssid = "ssid 1"), - WifiScanEntry(ssid = "ssid 2"), - ) + listOf(WifiScanEntry(ssid = "ssid 1"), WifiScanEntry(ssid = "ssid 2")) runCurrent() looper.processAllMessages() @@ -204,10 +201,7 @@ class InternetTileNewImplTest : SysuiTestCase() { testScope.runTest { airplaneModeRepository.setIsAirplaneMode(true) connectivityRepository.defaultConnections.value = - DefaultConnectionModel( - wifi = Wifi(true), - isValidated = true, - ) + DefaultConnectionModel(wifi = Wifi(true), isValidated = true) wifiRepository.setIsWifiEnabled(true) wifiRepository.setWifiNetwork(ACTIVE_WIFI) @@ -222,10 +216,7 @@ class InternetTileNewImplTest : SysuiTestCase() { fun wifiConnected() = testScope.runTest { connectivityRepository.defaultConnections.value = - DefaultConnectionModel( - wifi = Wifi(true), - isValidated = true, - ) + DefaultConnectionModel(wifi = Wifi(true), isValidated = true) wifiRepository.setIsWifiEnabled(true) wifiRepository.setWifiNetwork(ACTIVE_WIFI) @@ -242,6 +233,7 @@ class InternetTileNewImplTest : SysuiTestCase() { whenever(wifiStateWorker.isWifiEnabled).thenReturn(true) underTest.secondaryClick(null) + looper.processAllMessages() verify(wifiStateWorker, times(1)).isWifiEnabled = eq(false) } @@ -251,6 +243,7 @@ class InternetTileNewImplTest : SysuiTestCase() { whenever(wifiStateWorker.isWifiEnabled).thenReturn(false) underTest.secondaryClick(null) + looper.processAllMessages() verify(wifiStateWorker, times(1)).isWifiEnabled = eq(true) } @@ -258,10 +251,6 @@ class InternetTileNewImplTest : SysuiTestCase() { companion object { const val WIFI_SSID = "test ssid" val ACTIVE_WIFI = - WifiNetworkModel.Active.of( - isValidated = true, - level = 4, - ssid = WIFI_SSID, - ) + WifiNetworkModel.Active.of(isValidated = true, level = 4, ssid = WIFI_SSID) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileTest.java index 0cf96047fcc0..b5ec0a022dd0 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/InternetTileTest.java @@ -180,6 +180,7 @@ public class InternetTileTest extends SysuiTestCase { when(mWifiStateWorker.isWifiEnabled()).thenReturn(true); mTile.secondaryClick(null); + mTestableLooper.processAllMessages(); verify(mWifiStateWorker, times(1)).setWifiEnabled(eq(false)); } @@ -189,6 +190,7 @@ public class InternetTileTest extends SysuiTestCase { when(mWifiStateWorker.isWifiEnabled()).thenReturn(false); mTile.secondaryClick(null); + mTestableLooper.processAllMessages(); verify(mWifiStateWorker, times(1)).setWifiEnabled(eq(true)); } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java index 03c1f92aad4c..4068d9fd7f3d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java @@ -46,6 +46,9 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Handler; import android.os.UserHandle; +import android.platform.test.annotations.DisableFlags; +import android.platform.test.annotations.EnableFlags; +import android.service.quickaccesswallet.Flags; import android.service.quickaccesswallet.GetWalletCardsError; import android.service.quickaccesswallet.GetWalletCardsResponse; import android.service.quickaccesswallet.QuickAccessWalletClient; @@ -221,6 +224,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test + @DisableFlags({Flags.FLAG_LAUNCH_SELECTED_CARD_FROM_QS_TILE}) public void testHandleClick_startQuickAccessUiIntent_noCard() { setUpWalletCard(/* hasCard= */ false); @@ -234,6 +238,7 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test + @DisableFlags({Flags.FLAG_LAUNCH_SELECTED_CARD_FROM_QS_TILE}) public void testHandleClick_startQuickAccessUiIntent_hasCard() { setUpWalletCard(/* hasCard= */ true); @@ -247,6 +252,34 @@ public class QuickAccessWalletTileTest extends SysuiTestCase { } @Test + @EnableFlags({Flags.FLAG_LAUNCH_SELECTED_CARD_FROM_QS_TILE}) + public void testHandleClick_startCardIntent_noCard() { + setUpWalletCard(/* hasCard= */ false); + + mTile.handleClick(/* view= */ null); + mTestableLooper.processAllMessages(); + + verify(mController).startQuickAccessUiIntent( + eq(mActivityStarter), + eq(null), + /* hasCard= */ eq(false)); + } + + @Test + @EnableFlags({Flags.FLAG_LAUNCH_SELECTED_CARD_FROM_QS_TILE}) + public void testHandleClick_startCardIntent_hasCard() { + setUpWalletCard(/* hasCard= */ true); + + mTile.handleClick(null /* view */); + mTestableLooper.processAllMessages(); + + verify(mController).startWalletCardPendingIntent( + any(), + eq(mActivityStarter), + eq(null)); + } + + @Test public void testHandleUpdateState_updateLabelAndIcon() { QSTile.State state = new QSTile.State(); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java index 53708fd417e1..6ebe8309bf69 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java @@ -23,11 +23,13 @@ import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Dialog; +import android.media.projection.StopReason; import android.os.Handler; import android.service.quicksettings.Tile; import android.testing.TestableLooper; @@ -214,7 +216,7 @@ public class ScreenRecordTileTest extends SysuiTestCase { mTile.handleClick(null /* view */); - verify(mController, times(1)).stopRecording(); + verify(mController, times(1)).stopRecording(eq(StopReason.STOP_QS_TILE)); } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt index 0b56d7b64aab..778c73fd8638 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt @@ -17,6 +17,7 @@ package com.android.systemui.qs.tiles.impl.screenrecord.domain.interactor import android.app.Dialog +import android.media.projection.StopReason import android.os.UserHandle import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest @@ -92,7 +93,7 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { underTest.handleInput(QSTileInputTestKtx.click(recordingModel)) - verify(recordingController).stopRecording() + verify(recordingController).stopRecording(eq(StopReason.STOP_QS_TILE)) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt index b5f005cdc706..e56b965d9402 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt @@ -47,6 +47,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator import com.android.systemui.keyguard.ui.viewmodel.lockscreenUserActionsViewModel import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.collectLastValue +import com.android.systemui.kosmos.currentValue import com.android.systemui.kosmos.runCurrent import com.android.systemui.kosmos.runTest import com.android.systemui.kosmos.testScope @@ -77,6 +78,7 @@ import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.launch import kotlinx.coroutines.test.advanceTimeBy import kotlinx.coroutines.test.runCurrent +import kotlinx.coroutines.test.runTest import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -399,9 +401,8 @@ class SceneFrameworkIntegrationTest : SysuiTestCase() { * Note that this doesn't assert what the current scene is in the UI. */ private fun Kosmos.assertCurrentScene(expected: SceneKey) { - testScope.runCurrent() assertWithMessage("Current scene mismatch!") - .that(sceneContainerViewModel.currentScene.value) + .that(currentValue(sceneContainerViewModel.currentScene)) .isEqualTo(expected) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt index bb2e9417ecef..fc915ca24d89 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/scene/ui/viewmodel/GoneUserActionsViewModelTest.kt @@ -104,7 +104,7 @@ class GoneUserActionsViewModelTest : SysuiTestCase() { runCurrent() assertThat(userActions?.get(swipeDownFromTopWithTwoFingers())) - .isEqualTo(UserActionResult(Scenes.QuickSettings, isIrreversible = true)) + .isEqualTo(UserActionResult(Scenes.QuickSettings)) } @Test @@ -116,7 +116,7 @@ class GoneUserActionsViewModelTest : SysuiTestCase() { runCurrent() assertThat(userActions?.get(swipeDownFromTopWithTwoFingers())) - .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true)) + .isEqualTo(UserActionResult(Scenes.Shade, ToSplitShade)) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenrecord/RecordingServiceTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenrecord/RecordingServiceTest.java index a6a1d4a05dc7..50fa9d29659d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenrecord/RecordingServiceTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenrecord/RecordingServiceTest.java @@ -41,6 +41,7 @@ import android.app.ActivityOptions.LaunchCookie; import android.app.Notification; import android.app.NotificationManager; import android.content.Intent; +import android.media.projection.StopReason; import android.os.Handler; import android.os.RemoteException; import android.os.UserHandle; @@ -199,16 +200,16 @@ public class RecordingServiceTest extends SysuiTestCase { public void testOnSystemRequestedStop_recordingInProgress_endsRecording() throws IOException { doReturn(true).when(mController).isRecording(); - mRecordingService.onStopped(); + mRecordingService.onStopped(StopReason.STOP_UNKNOWN); - verify(mScreenMediaRecorder).end(); + verify(mScreenMediaRecorder).end(eq(StopReason.STOP_UNKNOWN)); } @Test public void testOnSystemRequestedStop_recordingInProgress_updatesState() { doReturn(true).when(mController).isRecording(); - mRecordingService.onStopped(); + mRecordingService.onStopped(StopReason.STOP_UNKNOWN); assertUpdateState(false); } @@ -218,18 +219,18 @@ public class RecordingServiceTest extends SysuiTestCase { throws IOException { doReturn(false).when(mController).isRecording(); - mRecordingService.onStopped(); + mRecordingService.onStopped(StopReason.STOP_UNKNOWN); - verify(mScreenMediaRecorder, never()).end(); + verify(mScreenMediaRecorder, never()).end(StopReason.STOP_UNKNOWN); } @Test public void testOnSystemRequestedStop_recorderEndThrowsRuntimeException_releasesRecording() throws IOException { doReturn(true).when(mController).isRecording(); - doThrow(new RuntimeException()).when(mScreenMediaRecorder).end(); + doThrow(new RuntimeException()).when(mScreenMediaRecorder).end(StopReason.STOP_UNKNOWN); - mRecordingService.onStopped(); + mRecordingService.onStopped(StopReason.STOP_UNKNOWN); verify(mScreenMediaRecorder).release(); } @@ -238,7 +239,7 @@ public class RecordingServiceTest extends SysuiTestCase { public void testOnSystemRequestedStop_whenRecordingInProgress_showsNotifications() { doReturn(true).when(mController).isRecording(); - mRecordingService.onStopped(); + mRecordingService.onStopped(StopReason.STOP_UNKNOWN); // Processing notification ArgumentCaptor<Notification> notifCaptor = ArgumentCaptor.forClass(Notification.class); @@ -271,9 +272,9 @@ public class RecordingServiceTest extends SysuiTestCase { public void testOnSystemRequestedStop_recorderEndThrowsRuntimeException_showsErrorNotification() throws IOException { doReturn(true).when(mController).isRecording(); - doThrow(new RuntimeException()).when(mScreenMediaRecorder).end(); + doThrow(new RuntimeException()).when(mScreenMediaRecorder).end(anyInt()); - mRecordingService.onStopped(); + mRecordingService.onStopped(StopReason.STOP_UNKNOWN); verify(mRecordingService).createErrorSavingNotification(any()); ArgumentCaptor<Notification> notifCaptor = ArgumentCaptor.forClass(Notification.class); @@ -289,9 +290,9 @@ public class RecordingServiceTest extends SysuiTestCase { public void testOnSystemRequestedStop_recorderEndThrowsOOMError_releasesRecording() throws IOException { doReturn(true).when(mController).isRecording(); - doThrow(new OutOfMemoryError()).when(mScreenMediaRecorder).end(); + doThrow(new OutOfMemoryError()).when(mScreenMediaRecorder).end(anyInt()); - assertThrows(Throwable.class, () -> mRecordingService.onStopped()); + assertThrows(Throwable.class, () -> mRecordingService.onStopped(StopReason.STOP_UNKNOWN)); verify(mScreenMediaRecorder).release(); } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenrecord/data/repository/ScreenRecordRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenrecord/data/repository/ScreenRecordRepositoryTest.kt index aceea909e595..ade5941d010d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenrecord/data/repository/ScreenRecordRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenrecord/data/repository/ScreenRecordRepositoryTest.kt @@ -16,6 +16,7 @@ package com.android.systemui.screenrecord.data.repository +import android.media.projection.StopReason import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase @@ -31,6 +32,7 @@ import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq import org.mockito.kotlin.mock import org.mockito.kotlin.verify import org.mockito.kotlin.whenever @@ -126,8 +128,8 @@ class ScreenRecordRepositoryTest : SysuiTestCase() { @Test fun stopRecording_invokesController() = testScope.runTest { - underTest.stopRecording() + underTest.stopRecording(StopReason.STOP_PRIVACY_CHIP) - verify(recordingController).stopRecording() + verify(recordingController).stopRecording(eq(StopReason.STOP_PRIVACY_CHIP)) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt index 612d646bb7d4..53a083f9ceae 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt @@ -17,13 +17,13 @@ package com.android.systemui.screenshot import android.content.Intent -import androidx.test.ext.junit.runners.AndroidJUnit4 import android.os.Process.myUserHandle import android.platform.test.annotations.EnableFlags import android.testing.TestableContext +import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.systemui.Flags import com.android.systemui.SysuiTestCase -import com.android.systemui.screenshot.proxy.SystemUiProxy +import com.android.systemui.screenshot.proxy.ScreenshotProxy import com.android.systemui.settings.DisplayTracker import com.android.systemui.shared.system.ActivityManagerWrapper import com.android.systemui.statusbar.phone.CentralSurfaces @@ -45,7 +45,7 @@ class ActionIntentExecutorTest : SysuiTestCase() { private val testableContext = TestableContext(mContext) private val activityManagerWrapper = mock<ActivityManagerWrapper>() - private val systemUiProxy = mock<SystemUiProxy>() + private val screenshotProxy = mock<ScreenshotProxy>() private val displayTracker = mock<DisplayTracker>() @@ -55,7 +55,7 @@ class ActionIntentExecutorTest : SysuiTestCase() { activityManagerWrapper, testScope, mainDispatcher, - systemUiProxy, + screenshotProxy, displayTracker, ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java index 093ef46569d1..764068ec1bf5 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java @@ -172,7 +172,8 @@ public class NotificationShadeWindowControllerImplTest extends SysuiTestCase { mUserTracker, mKosmos.getNotificationShadeWindowModel(), mSecureSettings, - mKosmos::getCommunalInteractor); + mKosmos::getCommunalInteractor, + mKosmos.getShadeLayoutParams()); mNotificationShadeWindowController.setScrimsVisibilityListener((visibility) -> {}); mNotificationShadeWindowController.fetchWindowRootView(); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt index 80cf2f04f035..a8d5c31873de 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorTest.kt @@ -16,29 +16,25 @@ package com.android.systemui.shade.domain.interactor -import android.content.Context +import android.content.mockedContext import android.content.res.Configuration -import android.content.res.Resources +import android.content.res.mockResources import android.view.Display -import android.view.WindowManager -import android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE +import android.view.mockWindowManager import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.display.data.repository.FakeDisplayWindowPropertiesRepository -import com.android.systemui.display.shared.model.DisplayWindowProperties -import com.android.systemui.scene.ui.view.WindowRootView -import com.android.systemui.shade.data.repository.FakeShadeDisplayRepository -import java.util.Optional +import com.android.systemui.kosmos.testScope +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.scene.ui.view.mockShadeRootView +import com.android.systemui.shade.data.repository.fakeShadeDisplaysRepository +import com.android.systemui.testKosmos import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.TestScope -import kotlinx.coroutines.test.UnconfinedTestDispatcher import kotlinx.coroutines.test.advanceUntilIdle import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.inOrder -import org.mockito.Mockito.verify import org.mockito.kotlin.any import org.mockito.kotlin.eq import org.mockito.kotlin.mock @@ -49,26 +45,18 @@ import org.mockito.kotlin.whenever @RunWith(AndroidJUnit4::class) @SmallTest class ShadeDisplaysInteractorTest : SysuiTestCase() { + val kosmos = testKosmos().useUnconfinedTestDispatcher() - private val shadeRootview = mock<WindowRootView>() - private val positionRepository = FakeShadeDisplayRepository() - private val shadeContext = mock<Context>() - private val contextStore = FakeDisplayWindowPropertiesRepository(context) - private val testScope = TestScope(UnconfinedTestDispatcher()) - private val shadeWm = mock<WindowManager>() - private val resources = mock<Resources>() + private val shadeRootview = kosmos.mockShadeRootView + private val positionRepository = kosmos.fakeShadeDisplaysRepository + private val shadeContext = kosmos.mockedContext + private val testScope = kosmos.testScope + private val shadeWm = kosmos.mockWindowManager + private val resources = kosmos.mockResources private val configuration = mock<Configuration>() private val display = mock<Display>() - private val interactor = - ShadeDisplaysInteractor( - Optional.of(shadeRootview), - positionRepository, - shadeContext, - shadeWm, - testScope.backgroundScope, - testScope.backgroundScope.coroutineContext, - ) + private val underTest = kosmos.shadeDisplaysInteractor @Before fun setup() { @@ -80,23 +68,14 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { whenever(shadeContext.displayId).thenReturn(0) whenever(shadeContext.getSystemService(any())).thenReturn(shadeWm) whenever(shadeContext.resources).thenReturn(resources) - contextStore.insert( - DisplayWindowProperties( - displayId = 0, - windowType = TYPE_NOTIFICATION_SHADE, - context = shadeContext, - windowManager = shadeWm, - layoutInflater = mock(), - ) - ) } @Test fun start_shadeInCorrectPosition_notAddedOrRemoved() { whenever(display.displayId).thenReturn(0) positionRepository.setDisplayId(0) - interactor.start() - testScope.advanceUntilIdle() + + underTest.start() verifyNoMoreInteractions(shadeWm) } @@ -105,7 +84,8 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { fun start_shadeInWrongPosition_changes() { whenever(display.displayId).thenReturn(0) positionRepository.setDisplayId(1) - interactor.start() + + underTest.start() inOrder(shadeWm).apply { verify(shadeWm).removeView(eq(shadeRootview)) @@ -117,9 +97,10 @@ class ShadeDisplaysInteractorTest : SysuiTestCase() { fun start_shadePositionChanges_removedThenAdded() { whenever(display.displayId).thenReturn(0) positionRepository.setDisplayId(0) - interactor.start() + underTest.start() positionRepository.setDisplayId(1) + testScope.advanceUntilIdle() inOrder(shadeWm).apply { verify(shadeWm).removeView(eq(shadeRootview)) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorTest.kt index 7fed47a4653e..e96dd16e9023 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractorTest.kt @@ -42,7 +42,8 @@ class SingleNotificationChipInteractorTest : SysuiTestCase() { fun notificationChip_startsWithStartingModel() = kosmos.runTest { val icon = mock<StatusBarIconView>() - val startingNotif = activeNotificationModel(key = "notif1", statusBarChipIcon = icon) + val startingNotif = + activeNotificationModel(key = "notif1", statusBarChipIcon = icon, whenTime = 5432) val underTest = factory.create(startingNotif) @@ -50,6 +51,7 @@ class SingleNotificationChipInteractorTest : SysuiTestCase() { assertThat(latest!!.key).isEqualTo("notif1") assertThat(latest!!.statusBarChipIconView).isEqualTo(icon) + assertThat(latest!!.whenTime).isEqualTo(5432) } @Test @@ -65,11 +67,16 @@ class SingleNotificationChipInteractorTest : SysuiTestCase() { val newIconView = mock<StatusBarIconView>() underTest.setNotification( - activeNotificationModel(key = "notif1", statusBarChipIcon = newIconView) + activeNotificationModel( + key = "notif1", + statusBarChipIcon = newIconView, + whenTime = 6543, + ) ) assertThat(latest!!.key).isEqualTo("notif1") assertThat(latest!!.statusBarChipIconView).isEqualTo(newIconView) + assertThat(latest!!.whenTime).isEqualTo(6543) } @Test diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorTest.kt index 702e101d2d39..5a894ca895c3 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/domain/interactor/StatusBarNotificationChipsInteractorTest.kt @@ -30,6 +30,7 @@ import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifCh import com.android.systemui.statusbar.notification.data.model.activeNotificationModel import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository +import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel import com.android.systemui.statusbar.notification.shared.ActiveNotificationModel import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat @@ -60,7 +61,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = mock<StatusBarIconView>(), - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -90,7 +91,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = null, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -110,7 +111,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = icon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -133,17 +134,17 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif1", statusBarChipIcon = firstIcon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif1").build(), ), activeNotificationModel( key = "notif2", statusBarChipIcon = secondIcon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif2").build(), ), activeNotificationModel( key = "notif3", statusBarChipIcon = mock<StatusBarIconView>(), - isPromoted = false, + promotedContent = null, ), ) ) @@ -170,7 +171,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = firstIcon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -183,7 +184,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = secondIcon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -196,7 +197,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = thirdIcon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -216,7 +217,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = mock(), - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -228,7 +229,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = mock(), - isPromoted = false, + promotedContent = null, ) ) ) @@ -239,7 +240,7 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = mock(), - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -260,7 +261,8 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif|uid1", statusBarChipIcon = firstIcon, - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("notif|uid1").build(), ) ) ) @@ -274,7 +276,8 @@ class StatusBarNotificationChipsInteractorTest : SysuiTestCase() { activeNotificationModel( key = "notif|uid2", statusBarChipIcon = secondIcon, - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("notif|uid2").build(), ) ) ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt index 16376c5b3850..11831ca97389 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt @@ -32,6 +32,7 @@ import com.android.systemui.statusbar.chips.ui.model.OngoingActivityChipModel import com.android.systemui.statusbar.notification.data.model.activeNotificationModel import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository +import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel import com.android.systemui.statusbar.notification.shared.ActiveNotificationModel import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat @@ -75,7 +76,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = null, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -94,14 +95,14 @@ class NotifChipsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = icon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) assertThat(latest).hasSize(1) val chip = latest!![0] - assertThat(chip).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java) + assertThat(chip).isInstanceOf(OngoingActivityChipModel.Shown.ShortTimeDelta::class.java) assertThat(chip.icon).isEqualTo(OngoingActivityChipModel.ChipIcon.StatusBarView(icon)) } @@ -117,17 +118,17 @@ class NotifChipsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "notif1", statusBarChipIcon = firstIcon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif1").build(), ), activeNotificationModel( key = "notif2", statusBarChipIcon = secondIcon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif2").build(), ), activeNotificationModel( key = "notif3", statusBarChipIcon = mock<StatusBarIconView>(), - isPromoted = false, + promotedContent = null, ), ) ) @@ -151,7 +152,8 @@ class NotifChipsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "clickTest", statusBarChipIcon = mock<StatusBarIconView>(), - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("clickTest").build(), ) ) ) @@ -171,7 +173,8 @@ class NotifChipsViewModelTest : SysuiTestCase() { companion object { fun assertIsNotifChip(latest: OngoingActivityChipModel?, expectedIcon: StatusBarIconView) { - assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java) + assertThat(latest) + .isInstanceOf(OngoingActivityChipModel.Shown.ShortTimeDelta::class.java) assertThat((latest as OngoingActivityChipModel.Shown).icon) .isEqualTo(OngoingActivityChipModel.ChipIcon.StatusBarView(expectedIcon)) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt index eb0978eff24b..b2e7febd1743 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsWithNotifsViewModelTest.kt @@ -53,6 +53,7 @@ import com.android.systemui.statusbar.commandline.commandRegistry import com.android.systemui.statusbar.notification.data.model.activeNotificationModel import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository +import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel import com.android.systemui.statusbar.notification.shared.ActiveNotificationModel import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.statusbar.phone.ongoingcall.data.repository.ongoingCallRepository @@ -307,7 +308,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = icon, - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) @@ -328,12 +329,14 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "firstNotif", statusBarChipIcon = firstIcon, - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("firstNotif").build(), ), activeNotificationModel( key = "secondNotif", statusBarChipIcon = secondIcon, - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("secondNotif").build(), ), ) ) @@ -355,17 +358,20 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "firstNotif", statusBarChipIcon = firstIcon, - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("firstNotif").build(), ), activeNotificationModel( key = "secondNotif", statusBarChipIcon = secondIcon, - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("secondNotif").build(), ), activeNotificationModel( key = "thirdNotif", statusBarChipIcon = thirdIcon, - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("thirdNotif").build(), ), ) ) @@ -386,12 +392,14 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "firstNotif", statusBarChipIcon = firstIcon, - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("firstNotif").build(), ), activeNotificationModel( key = "secondNotif", statusBarChipIcon = mock<StatusBarIconView>(), - isPromoted = true, + promotedContent = + PromotedNotificationContentModel.Builder("secondNotif").build(), ), ) ) @@ -412,7 +420,7 @@ class OngoingActivityChipsWithNotifsViewModelTest : SysuiTestCase() { activeNotificationModel( key = "notif", statusBarChipIcon = mock<StatusBarIconView>(), - isPromoted = true, + promotedContent = PromotedNotificationContentModel.Builder("notif").build(), ) ) ) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java index ba85e32484df..657fffb1875d 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/VisualStabilityCoordinatorTest.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -45,6 +46,8 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.communal.shared.model.CommunalScenes; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.BrokenWithSceneContainer; +import com.android.systemui.flags.DisableSceneContainer; +import com.android.systemui.flags.EnableSceneContainer; import com.android.systemui.keyguard.WakefulnessLifecycle; import com.android.systemui.keyguard.shared.model.KeyguardState; import com.android.systemui.keyguard.shared.model.TransitionState; @@ -68,6 +71,7 @@ import com.android.systemui.statusbar.notification.collection.listbuilder.plugga import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider; import com.android.systemui.statusbar.notification.domain.interactor.SeenNotificationsInteractor; import com.android.systemui.statusbar.notification.headsup.HeadsUpManager; +import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.kotlin.JavaAdapter; import com.android.systemui.util.time.FakeSystemClock; @@ -110,6 +114,7 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { @Mock private VisibilityLocationProvider mVisibilityLocationProvider; @Mock private VisualStabilityProvider mVisualStabilityProvider; @Mock private VisualStabilityCoordinatorLogger mLogger; + @Mock private KeyguardStateController mKeyguardStateController; @Captor private ArgumentCaptor<WakefulnessLifecycle.Observer> mWakefulnessObserverCaptor; @Captor private ArgumentCaptor<StatusBarStateController.StateListener> mSBStateListenerCaptor; @@ -155,6 +160,7 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { mKosmos.getCommunalSceneInteractor(), mKosmos.getShadeInteractor(), mKosmos.getKeyguardTransitionInteractor(), + mKeyguardStateController, mLogger); mCoordinator.attach(mNotifPipeline); mTestScope.getTestScheduler().runCurrent(); @@ -539,6 +545,25 @@ public class VisualStabilityCoordinatorTest extends SysuiTestCase { @Test @EnableFlags(Flags.FLAG_CHECK_LOCKSCREEN_GONE_TRANSITION) + @DisableSceneContainer + public void testNotLockscreenInGoneTransitionLegacy_invalidationCalled() { + // GIVEN visual stability is being maintained b/c animation is playing + doReturn(true).when(mKeyguardStateController).isKeyguardFadingAway(); + mCoordinator.mKeyguardFadeAwayAnimationCallback.onKeyguardFadingAwayChanged(); + + assertFalse(mNotifStabilityManager.isPipelineRunAllowed()); + + // WHEN the animation has stopped playing + doReturn(false).when(mKeyguardStateController).isKeyguardFadingAway(); + mCoordinator.mKeyguardFadeAwayAnimationCallback.onKeyguardFadingAwayChanged(); + + // invalidate is called, b/c we were previously suppressing the pipeline from running + verifyStabilityManagerWasInvalidated(times(1)); + } + + @Test + @EnableFlags(Flags.FLAG_CHECK_LOCKSCREEN_GONE_TRANSITION) + @EnableSceneContainer @BrokenWithSceneContainer(bugId = 377868472) // mReorderingAllowed is broken with SceneContainer public void testNotLockscreenInGoneTransition_invalidationCalled() { // GIVEN visual stability is being maintained b/c animation is playing diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/ActiveNotificationsInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/ActiveNotificationsInteractorTest.kt index 99bda856818e..54ce88b40c11 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/ActiveNotificationsInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/ActiveNotificationsInteractorTest.kt @@ -31,6 +31,7 @@ import com.android.systemui.statusbar.notification.data.model.activeNotification import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository import com.android.systemui.statusbar.notification.data.repository.setActiveNotifs +import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel import com.android.systemui.statusbar.notification.shared.CallType import com.android.systemui.testKosmos import com.google.common.truth.Truth.assertThat @@ -169,8 +170,12 @@ class ActiveNotificationsInteractorTest : SysuiTestCase() { testScope.runTest { val latest by collectLastValue(underTest.promotedOngoingNotifications) - val promoted1 = activeNotificationModel(key = "notif1", isPromoted = true) - val notPromoted2 = activeNotificationModel(key = "notif2", isPromoted = false) + val promoted1 = + activeNotificationModel( + key = "notif1", + promotedContent = PromotedNotificationContentModel.Builder("notif1").build(), + ) + val notPromoted2 = activeNotificationModel(key = "notif2", promotedContent = null) activeNotificationListRepository.activeNotifications.value = ActiveNotificationsStore.Builder() @@ -189,9 +194,9 @@ class ActiveNotificationsInteractorTest : SysuiTestCase() { activeNotificationListRepository.activeNotifications.value = ActiveNotificationsStore.Builder() - .apply { activeNotificationModel(key = "notif1", isPromoted = false) } - .apply { activeNotificationModel(key = "notif2", isPromoted = false) } - .apply { activeNotificationModel(key = "notif3", isPromoted = false) } + .apply { activeNotificationModel(key = "notif1", promotedContent = null) } + .apply { activeNotificationModel(key = "notif2", promotedContent = null) } + .apply { activeNotificationModel(key = "notif3", promotedContent = null) } .build() assertThat(latest!!).isEmpty() @@ -203,10 +208,18 @@ class ActiveNotificationsInteractorTest : SysuiTestCase() { testScope.runTest { val latest by collectLastValue(underTest.promotedOngoingNotifications) - val promoted1 = activeNotificationModel(key = "notif1", isPromoted = true) - val notPromoted2 = activeNotificationModel(key = "notif2", isPromoted = false) - val notPromoted3 = activeNotificationModel(key = "notif3", isPromoted = false) - val promoted4 = activeNotificationModel(key = "notif4", isPromoted = true) + val promoted1 = + activeNotificationModel( + key = "notif1", + promotedContent = PromotedNotificationContentModel.Builder("notif1").build(), + ) + val notPromoted2 = activeNotificationModel(key = "notif2", promotedContent = null) + val notPromoted3 = activeNotificationModel(key = "notif3", promotedContent = null) + val promoted4 = + activeNotificationModel( + key = "notif4", + promotedContent = PromotedNotificationContentModel.Builder("notif4").build(), + ) activeNotificationListRepository.activeNotifications.value = ActiveNotificationsStore.Builder() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationsListInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationsListInteractorTest.kt index 183f9016a23b..5d9aa71c5d89 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationsListInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationsListInteractorTest.kt @@ -16,7 +16,6 @@ package com.android.systemui.statusbar.notification.domain.interactor import android.app.Notification -import android.app.Notification.FLAG_PROMOTED_ONGOING import android.platform.test.annotations.EnableFlags import android.service.notification.StatusBarNotification import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -29,7 +28,7 @@ import com.android.systemui.statusbar.notification.collection.GroupEntry import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUi -import com.android.systemui.statusbar.notification.promoted.promotedNotificationsProvider +import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel import com.android.systemui.statusbar.notification.shared.byKey import com.android.systemui.testKosmos import com.android.systemui.util.mockito.mock @@ -48,11 +47,7 @@ class RenderNotificationsListInteractorTest : SysuiTestCase() { private val notifsRepository = kosmos.activeNotificationListRepository private val notifsInteractor = kosmos.activeNotificationsInteractor private val underTest = - RenderNotificationListInteractor( - notifsRepository, - sectionStyleProvider = mock(), - promotedNotificationsProvider = kosmos.promotedNotificationsProvider, - ) + RenderNotificationListInteractor(notifsRepository, sectionStyleProvider = mock()) @Test fun setRenderedList_preservesOrdering() = @@ -127,12 +122,16 @@ class RenderNotificationsListInteractorTest : SysuiTestCase() { @Test @EnableFlags(PromotedNotificationUi.FLAG_NAME) - fun setRenderList_setsPromotionStatus() = + fun setRenderList_setsPromotionContent() = testScope.runTest { val actual by collectLastValue(notifsInteractor.topLevelRepresentativeNotifications) - val notPromoted1 = mockNotificationEntry("key1", flag = null) - val promoted2 = mockNotificationEntry("key2", flag = FLAG_PROMOTED_ONGOING) + val notPromoted1 = mockNotificationEntry("key1", promotedContent = null) + val promoted2 = + mockNotificationEntry( + "key2", + promotedContent = PromotedNotificationContentModel.Builder("key2").build(), + ) underTest.setRenderedList(listOf(notPromoted1, promoted2)) @@ -140,22 +139,19 @@ class RenderNotificationsListInteractorTest : SysuiTestCase() { val first = actual!![0] assertThat(first.key).isEqualTo("key1") - assertThat(first.isPromoted).isFalse() + assertThat(first.promotedContent).isNull() val second = actual!![1] assertThat(second.key).isEqualTo("key2") - assertThat(second.isPromoted).isTrue() + assertThat(second.promotedContent).isNotNull() } private fun mockNotificationEntry( key: String, rank: Int = 0, - flag: Int? = null, + promotedContent: PromotedNotificationContentModel? = null, ): NotificationEntry { val nBuilder = Notification.Builder(context, "a") - if (flag != null) { - nBuilder.setFlag(flag, true) - } val notification = nBuilder.build() val mockSbn = @@ -169,6 +165,7 @@ class RenderNotificationsListInteractorTest : SysuiTestCase() { whenever(this.representativeEntry).thenReturn(this) whenever(this.ranking).thenReturn(RankingBuilder().setRank(rank).build()) whenever(this.sbn).thenReturn(mockSbn) + whenever(this.promotedNotificationContentModel).thenReturn(promotedContent) } } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/AvalancheControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/AvalancheControllerTest.kt index 22a9c64d2cc9..31a2bd0371aa 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/AvalancheControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/AvalancheControllerTest.kt @@ -38,6 +38,7 @@ import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper import com.android.systemui.statusbar.policy.configurationController import com.android.systemui.testKosmos import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.concurrency.mockExecutorHandler import com.android.systemui.util.kotlin.JavaAdapter import com.android.systemui.util.settings.FakeGlobalSettings import com.android.systemui.util.time.FakeSystemClock @@ -97,7 +98,7 @@ class AvalancheControllerTest : SysuiTestCase() { AvalancheController(dumpManager, mUiEventLoggerFake, mHeadsUpManagerLogger, mBgHandler) testableHeadsUpManager = - TestableHeadsUpManager( + HeadsUpManagerImpl( mContext, mLogger, kosmos.statusBarStateController, @@ -105,9 +106,10 @@ class AvalancheControllerTest : SysuiTestCase() { GroupMembershipManagerImpl(), kosmos.visualStabilityProvider, kosmos.configurationController, - mExecutor, + mockExecutorHandler(mExecutor), mGlobalSettings, mSystemClock, + mExecutor, mAccessibilityMgr, mUiEventLoggerFake, JavaAdapter(kosmos.testScope), diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplOldTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplOldTest.kt new file mode 100644 index 000000000000..8b4f53a88a6f --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplOldTest.kt @@ -0,0 +1,698 @@ +/* + * Copyright (C) 2019 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.headsup + +import android.app.Notification +import android.app.PendingIntent +import android.app.Person +import android.os.Handler +import android.platform.test.annotations.DisableFlags +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.FlagsParameterization +import android.testing.TestableLooper.RunWithLooper +import androidx.test.filters.SmallTest +import com.android.internal.logging.testing.UiEventLoggerFake +import com.android.systemui.SysuiTestCase +import com.android.systemui.dump.DumpManager +import com.android.systemui.kosmos.KosmosJavaAdapter +import com.android.systemui.log.logcatLogBuffer +import com.android.systemui.res.R +import com.android.systemui.shade.domain.interactor.ShadeInteractor +import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder +import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManagerImpl +import com.android.systemui.statusbar.notification.headsup.HeadsUpManagerImpl.HeadsUpEntry +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow +import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun +import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper +import com.android.systemui.util.concurrency.FakeExecutor +import com.android.systemui.util.concurrency.mockExecutorHandler +import com.android.systemui.util.kotlin.JavaAdapter +import com.android.systemui.util.settings.FakeGlobalSettings +import com.android.systemui.util.time.FakeSystemClock +import com.google.common.truth.Truth +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.flow.MutableStateFlow +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.ArgumentMatchers +import org.mockito.Mock +import org.mockito.Mockito +import org.mockito.invocation.InvocationOnMock +import org.mockito.junit.MockitoJUnit +import org.mockito.junit.MockitoRule +import org.mockito.kotlin.eq +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters + +@SmallTest +@RunWithLooper +@RunWith(ParameterizedAndroidJunit4::class) +// TODO(b/378142453): Merge this with HeadsUpManagerImplTest. +open class HeadsUpManagerImplOldTest(flags: FlagsParameterization?) : SysuiTestCase() { + protected var mKosmos: KosmosJavaAdapter = KosmosJavaAdapter(this) + + @JvmField @Rule var rule: MockitoRule = MockitoJUnit.rule() + + private val mUiEventLoggerFake = UiEventLoggerFake() + + private val mLogger: HeadsUpManagerLogger = Mockito.spy(HeadsUpManagerLogger(logcatLogBuffer())) + + @Mock private val mBgHandler: Handler? = null + + @Mock private val dumpManager: DumpManager? = null + + @Mock private val mShadeInteractor: ShadeInteractor? = null + private var mAvalancheController: AvalancheController? = null + + @Mock private val mAccessibilityMgr: AccessibilityManagerWrapper? = null + + protected val globalSettings: FakeGlobalSettings = FakeGlobalSettings() + protected val systemClock: FakeSystemClock = FakeSystemClock() + protected val executor: FakeExecutor = FakeExecutor(systemClock) + + @Mock protected var mRow: ExpandableNotificationRow? = null + + private fun createHeadsUpManager(): HeadsUpManagerImpl { + return HeadsUpManagerImpl( + mContext, + mLogger, + mKosmos.statusBarStateController, + mKosmos.keyguardBypassController, + GroupMembershipManagerImpl(), + mKosmos.visualStabilityProvider, + mKosmos.configurationController, + mockExecutorHandler(executor), + globalSettings, + systemClock, + executor, + mAccessibilityMgr, + mUiEventLoggerFake, + JavaAdapter(mKosmos.testScope), + mShadeInteractor, + mAvalancheController, + ) + } + + private fun createStickyEntry(id: Int): NotificationEntry { + val notif = + Notification.Builder(mContext, "") + .setSmallIcon(R.drawable.ic_person) + .setFullScreenIntent( + Mockito.mock(PendingIntent::class.java), /* highPriority */ + true, + ) + .build() + return HeadsUpManagerTestUtil.createEntry(id, notif) + } + + private fun createStickyForSomeTimeEntry(id: Int): NotificationEntry { + val notif = + Notification.Builder(mContext, "") + .setSmallIcon(R.drawable.ic_person) + .setFlag(Notification.FLAG_FSI_REQUESTED_BUT_DENIED, true) + .build() + return HeadsUpManagerTestUtil.createEntry(id, notif) + } + + private fun useAccessibilityTimeout(use: Boolean) { + if (use) { + Mockito.doReturn(TEST_A11Y_AUTO_DISMISS_TIME) + .`when`(mAccessibilityMgr!!) + .getRecommendedTimeoutMillis(ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt()) + } else { + Mockito.`when`( + mAccessibilityMgr!!.getRecommendedTimeoutMillis( + ArgumentMatchers.anyInt(), + ArgumentMatchers.anyInt(), + ) + ) + .then { i: InvocationOnMock -> i.getArgument(0) } + } + } + + init { + mSetFlagsRule.setFlagsParameterization(flags!!) + } + + @Throws(Exception::class) + override fun SysuiSetup() { + super.SysuiSetup() + mContext.getOrCreateTestableResources().apply { + this.addOverride(R.integer.ambient_notification_extension_time, TEST_EXTENSION_TIME) + this.addOverride(R.integer.touch_acceptance_delay, TEST_TOUCH_ACCEPTANCE_TIME) + this.addOverride( + R.integer.heads_up_notification_minimum_time, + TEST_MINIMUM_DISPLAY_TIME, + ) + this.addOverride( + R.integer.heads_up_notification_minimum_time_with_throttling, + TEST_MINIMUM_DISPLAY_TIME, + ) + this.addOverride(R.integer.heads_up_notification_decay, TEST_AUTO_DISMISS_TIME) + this.addOverride( + R.integer.sticky_heads_up_notification_time, + TEST_STICKY_AUTO_DISMISS_TIME, + ) + } + + mAvalancheController = + AvalancheController(dumpManager!!, mUiEventLoggerFake, mLogger, mBgHandler!!) + Mockito.`when`(mShadeInteractor!!.isAnyExpanded).thenReturn(MutableStateFlow(true)) + Mockito.`when`(mKosmos.keyguardBypassController.bypassEnabled).thenReturn(false) + } + + @Test + fun testHasNotifications_headsUpManagerMapNotEmpty_true() { + val bhum = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + bhum.showNotification(entry) + + Truth.assertThat(bhum.mHeadsUpEntryMap).isNotEmpty() + Truth.assertThat(bhum.hasNotifications()).isTrue() + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testHasNotifications_avalancheMapNotEmpty_true() { + val bhum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + val headsUpEntry = bhum.createHeadsUpEntry(notifEntry) + mAvalancheController!!.addToNext(headsUpEntry) {} + + Truth.assertThat(mAvalancheController!!.getWaitingEntryList()).isNotEmpty() + Truth.assertThat(bhum.hasNotifications()).isTrue() + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testHasNotifications_false() { + val bhum = createHeadsUpManager() + Truth.assertThat(bhum.mHeadsUpEntryMap).isEmpty() + Truth.assertThat(mAvalancheController!!.getWaitingEntryList()).isEmpty() + Truth.assertThat(bhum.hasNotifications()).isFalse() + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testGetHeadsUpEntryList_includesAvalancheEntryList() { + val bhum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + val headsUpEntry = bhum.createHeadsUpEntry(notifEntry) + mAvalancheController!!.addToNext(headsUpEntry) {} + + Truth.assertThat(bhum.headsUpEntryList).contains(headsUpEntry) + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testGetHeadsUpEntry_returnsAvalancheEntry() { + val bhum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + val headsUpEntry = bhum.createHeadsUpEntry(notifEntry) + mAvalancheController!!.addToNext(headsUpEntry) {} + + Truth.assertThat(bhum.getHeadsUpEntry(notifEntry.key)).isEqualTo(headsUpEntry) + } + + @Test + fun testShowNotification_addsEntry() { + val alm = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + alm.showNotification(entry) + + assertThat(alm.isHeadsUpEntry(entry.key)).isTrue() + assertThat(alm.hasNotifications()).isTrue() + assertThat(alm.getEntry(entry.key)).isEqualTo(entry) + } + + @Test + fun testShowNotification_autoDismisses() { + val alm = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + alm.showNotification(entry) + systemClock.advanceTime((TEST_AUTO_DISMISS_TIME * 3 / 2).toLong()) + + assertThat(alm.isHeadsUpEntry(entry.key)).isFalse() + } + + @Test + fun testRemoveNotification_removeDeferred() { + val alm = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + alm.showNotification(entry) + + val removedImmediately = + alm.removeNotification(entry.key, /* releaseImmediately= */ false, "removeDeferred") + assertThat(removedImmediately).isFalse() + assertThat(alm.isHeadsUpEntry(entry.key)).isTrue() + } + + @Test + fun testRemoveNotification_forceRemove() { + val alm = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + alm.showNotification(entry) + + val removedImmediately = + alm.removeNotification(entry.key, /* releaseImmediately= */ true, "forceRemove") + assertThat(removedImmediately).isTrue() + assertThat(alm.isHeadsUpEntry(entry.key)).isFalse() + } + + @Test + fun testReleaseAllImmediately() { + val alm = createHeadsUpManager() + for (i in 0 until TEST_NUM_NOTIFICATIONS) { + val entry = HeadsUpManagerTestUtil.createEntry(i, mContext) + entry.row = mRow + alm.showNotification(entry) + } + + alm.releaseAllImmediately() + + assertThat(alm.allEntries.count()).isEqualTo(0) + } + + @Test + fun testCanRemoveImmediately_notShownLongEnough() { + val alm = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + alm.showNotification(entry) + + // The entry has just been added so we should not remove immediately. + assertThat(alm.canRemoveImmediately(entry.key)).isFalse() + } + + @Test + fun testHunRemovedLogging() { + val hum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + val headsUpEntry = Mockito.mock(HeadsUpEntry::class.java) + Mockito.`when`(headsUpEntry.pinnedStatus) + .thenReturn(MutableStateFlow(PinnedStatus.NotPinned)) + headsUpEntry.mEntry = notifEntry + + hum.onEntryRemoved(headsUpEntry, "test") + + Mockito.verify(mLogger, Mockito.times(1)).logNotificationActuallyRemoved(eq(notifEntry)) + } + + @Test + fun testShowNotification_autoDismissesIncludingTouchAcceptanceDelay() { + val hum = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + useAccessibilityTimeout(false) + + hum.showNotification(entry) + systemClock.advanceTime((TEST_TOUCH_ACCEPTANCE_TIME / 2 + TEST_AUTO_DISMISS_TIME).toLong()) + + assertThat(hum.isHeadsUpEntry(entry.key)).isTrue() + } + + @Test + fun testShowNotification_autoDismissesWithDefaultTimeout() { + val hum = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + useAccessibilityTimeout(false) + + hum.showNotification(entry) + systemClock.advanceTime( + (TEST_TOUCH_ACCEPTANCE_TIME + + (TEST_AUTO_DISMISS_TIME + TEST_A11Y_AUTO_DISMISS_TIME) / 2) + .toLong() + ) + + assertThat(hum.isHeadsUpEntry(entry.key)).isFalse() + } + + @Test + fun testShowNotification_stickyForSomeTime_autoDismissesWithStickyTimeout() { + val hum = createHeadsUpManager() + val entry = createStickyForSomeTimeEntry(/* id= */ 0) + useAccessibilityTimeout(false) + + hum.showNotification(entry) + systemClock.advanceTime( + (TEST_TOUCH_ACCEPTANCE_TIME + + (TEST_AUTO_DISMISS_TIME + TEST_STICKY_AUTO_DISMISS_TIME) / 2) + .toLong() + ) + + assertThat(hum.isHeadsUpEntry(entry.key)).isTrue() + } + + @Test + fun testShowNotification_sticky_neverAutoDismisses() { + val hum = createHeadsUpManager() + val entry = createStickyEntry(/* id= */ 0) + useAccessibilityTimeout(false) + + hum.showNotification(entry) + systemClock.advanceTime( + (TEST_TOUCH_ACCEPTANCE_TIME + 2 * TEST_A11Y_AUTO_DISMISS_TIME).toLong() + ) + + assertThat(hum.isHeadsUpEntry(entry.key)).isTrue() + } + + @Test + fun testShowNotification_autoDismissesWithAccessibilityTimeout() { + val hum = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + useAccessibilityTimeout(true) + + hum.showNotification(entry) + systemClock.advanceTime( + (TEST_TOUCH_ACCEPTANCE_TIME + + (TEST_AUTO_DISMISS_TIME + TEST_A11Y_AUTO_DISMISS_TIME) / 2) + .toLong() + ) + + assertThat(hum.isHeadsUpEntry(entry.key)).isTrue() + } + + @Test + fun testShowNotification_stickyForSomeTime_autoDismissesWithAccessibilityTimeout() { + val hum = createHeadsUpManager() + val entry = createStickyForSomeTimeEntry(/* id= */ 0) + useAccessibilityTimeout(true) + + hum.showNotification(entry) + systemClock.advanceTime( + (TEST_TOUCH_ACCEPTANCE_TIME + + (TEST_STICKY_AUTO_DISMISS_TIME + TEST_A11Y_AUTO_DISMISS_TIME) / 2) + .toLong() + ) + + assertThat(hum.isHeadsUpEntry(entry.key)).isTrue() + } + + @Test + fun testRemoveNotification_beforeMinimumDisplayTime() { + val hum = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + useAccessibilityTimeout(false) + + hum.showNotification(entry) + + val removedImmediately = + hum.removeNotification( + entry.key, + /* releaseImmediately = */ false, + "beforeMinimumDisplayTime", + ) + assertThat(removedImmediately).isFalse() + assertThat(hum.isHeadsUpEntry(entry.key)).isTrue() + + systemClock.advanceTime(((TEST_MINIMUM_DISPLAY_TIME + TEST_AUTO_DISMISS_TIME) / 2).toLong()) + + assertThat(hum.isHeadsUpEntry(entry.key)).isFalse() + } + + @Test + fun testRemoveNotification_afterMinimumDisplayTime() { + val hum = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + useAccessibilityTimeout(false) + + hum.showNotification(entry) + systemClock.advanceTime(((TEST_MINIMUM_DISPLAY_TIME + TEST_AUTO_DISMISS_TIME) / 2).toLong()) + + assertThat(hum.isHeadsUpEntry(entry.key)).isTrue() + + val removedImmediately = + hum.removeNotification( + entry.key, + /* releaseImmediately = */ false, + "afterMinimumDisplayTime", + ) + assertThat(removedImmediately).isTrue() + assertThat(hum.isHeadsUpEntry(entry.key)).isFalse() + } + + @Test + fun testRemoveNotification_releaseImmediately() { + val hum = createHeadsUpManager() + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + hum.showNotification(entry) + + val removedImmediately = + hum.removeNotification( + entry.key, + /* releaseImmediately = */ true, + "afterMinimumDisplayTime", + ) + assertThat(removedImmediately).isTrue() + assertThat(hum.isHeadsUpEntry(entry.key)).isFalse() + } + + @Test + fun testIsSticky_rowPinnedAndExpanded_true() { + val hum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + Mockito.`when`(mRow!!.isPinned).thenReturn(true) + notifEntry.row = mRow + + hum.showNotification(notifEntry) + + val headsUpEntry = hum.getHeadsUpEntry(notifEntry.key) + headsUpEntry!!.setExpanded(true) + + assertThat(hum.isSticky(notifEntry.key)).isTrue() + } + + @Test + fun testIsSticky_remoteInputActive_true() { + val hum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + hum.showNotification(notifEntry) + + val headsUpEntry = hum.getHeadsUpEntry(notifEntry.key) + headsUpEntry!!.mRemoteInputActive = true + + assertThat(hum.isSticky(notifEntry.key)).isTrue() + } + + @Test + fun testIsSticky_hasFullScreenIntent_true() { + val hum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id= */ 0, mContext) + + hum.showNotification(notifEntry) + + assertThat(hum.isSticky(notifEntry.key)).isTrue() + } + + @Test + fun testIsSticky_stickyForSomeTime_false() { + val hum = createHeadsUpManager() + val entry = createStickyForSomeTimeEntry(/* id= */ 0) + + hum.showNotification(entry) + + assertThat(hum.isSticky(entry.key)).isFalse() + } + + @Test + fun testIsSticky_false() { + val hum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + hum.showNotification(notifEntry) + + val headsUpEntry = hum.getHeadsUpEntry(notifEntry.key) + headsUpEntry!!.setExpanded(false) + headsUpEntry.mRemoteInputActive = false + + assertThat(hum.isSticky(notifEntry.key)).isFalse() + } + + @Test + fun testCompareTo_withNullEntries() { + val hum = createHeadsUpManager() + val alertEntry = NotificationEntryBuilder().setTag("alert").build() + + hum.showNotification(alertEntry) + + assertThat(hum.compare(alertEntry, null)).isLessThan(0) + assertThat(hum.compare(null, alertEntry)).isGreaterThan(0) + assertThat(hum.compare(null, null)).isEqualTo(0) + } + + @Test + fun testCompareTo_withNonAlertEntries() { + val hum = createHeadsUpManager() + + val nonAlertEntry1 = NotificationEntryBuilder().setTag("nae1").build() + val nonAlertEntry2 = NotificationEntryBuilder().setTag("nae2").build() + val alertEntry = NotificationEntryBuilder().setTag("alert").build() + hum.showNotification(alertEntry) + + assertThat(hum.compare(alertEntry, nonAlertEntry1)).isLessThan(0) + assertThat(hum.compare(nonAlertEntry1, alertEntry)).isGreaterThan(0) + assertThat(hum.compare(nonAlertEntry1, nonAlertEntry2)).isEqualTo(0) + } + + @Test + fun testAlertEntryCompareTo_ongoingCallLessThanActiveRemoteInput() { + val hum = createHeadsUpManager() + + val ongoingCall = + hum.HeadsUpEntry( + NotificationEntryBuilder() + .setSbn( + HeadsUpManagerTestUtil.createSbn( + /* id = */ 0, + Notification.Builder(mContext, "") + .setCategory(Notification.CATEGORY_CALL) + .setOngoing(true), + ) + ) + .build() + ) + + val activeRemoteInput = + hum.HeadsUpEntry(HeadsUpManagerTestUtil.createEntry(/* id= */ 1, mContext)) + activeRemoteInput.mRemoteInputActive = true + + assertThat(ongoingCall.compareTo(activeRemoteInput)).isLessThan(0) + assertThat(activeRemoteInput.compareTo(ongoingCall)).isGreaterThan(0) + } + + @Test + fun testAlertEntryCompareTo_incomingCallLessThanActiveRemoteInput() { + val hum = createHeadsUpManager() + + val person = Person.Builder().setName("person").build() + val intent = Mockito.mock(PendingIntent::class.java) + val incomingCall = + hum.HeadsUpEntry( + NotificationEntryBuilder() + .setSbn( + HeadsUpManagerTestUtil.createSbn( + /* id = */ 0, + Notification.Builder(mContext, "") + .setStyle( + Notification.CallStyle.forIncomingCall(person, intent, intent) + ), + ) + ) + .build() + ) + + val activeRemoteInput = + hum.HeadsUpEntry(HeadsUpManagerTestUtil.createEntry(/* id= */ 1, mContext)) + activeRemoteInput.mRemoteInputActive = true + + assertThat(incomingCall.compareTo(activeRemoteInput)).isLessThan(0) + assertThat(activeRemoteInput.compareTo(incomingCall)).isGreaterThan(0) + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testPinEntry_logsPeek_throttleEnabled() { + val hum = createHeadsUpManager() + + // Needs full screen intent in order to be pinned + val entryToPin = + hum.HeadsUpEntry( + HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id= */ 0, mContext) + ) + + // Note: the standard way to show a notification would be calling showNotification rather + // than onAlertEntryAdded. However, in practice showNotification in effect adds + // the notification and then updates it; in order to not log twice, the entry needs + // to have a functional ExpandableNotificationRow that can keep track of whether it's + // pinned or not (via isRowPinned()). That feels like a lot to pull in to test this one bit. + hum.onEntryAdded(entryToPin) + + assertThat(mUiEventLoggerFake.numLogs()).isEqualTo(2) + assertThat(AvalancheController.ThrottleEvent.AVALANCHE_THROTTLING_HUN_SHOWN.getId()) + .isEqualTo(mUiEventLoggerFake.eventId(0)) + assertThat(HeadsUpManagerImpl.NotificationPeekEvent.NOTIFICATION_PEEK.id) + .isEqualTo(mUiEventLoggerFake.eventId(1)) + } + + @Test + @DisableFlags(NotificationThrottleHun.FLAG_NAME) + fun testPinEntry_logsPeek_throttleDisabled() { + val hum = createHeadsUpManager() + + // Needs full screen intent in order to be pinned + val entryToPin = + hum.HeadsUpEntry( + HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id= */ 0, mContext) + ) + + // Note: the standard way to show a notification would be calling showNotification rather + // than onAlertEntryAdded. However, in practice showNotification in effect adds + // the notification and then updates it; in order to not log twice, the entry needs + // to have a functional ExpandableNotificationRow that can keep track of whether it's + // pinned or not (via isRowPinned()). That feels like a lot to pull in to test this one bit. + hum.onEntryAdded(entryToPin) + + assertThat(mUiEventLoggerFake.numLogs()).isEqualTo(1) + assertThat(HeadsUpManagerImpl.NotificationPeekEvent.NOTIFICATION_PEEK.id) + .isEqualTo(mUiEventLoggerFake.eventId(0)) + } + + @Test + fun testSetUserActionMayIndirectlyRemove() { + val hum = createHeadsUpManager() + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + hum.showNotification(notifEntry) + + assertThat(hum.canRemoveImmediately(notifEntry.key)).isFalse() + + hum.setUserActionMayIndirectlyRemove(notifEntry) + + assertThat(hum.canRemoveImmediately(notifEntry.key)).isTrue() + } + + companion object { + const val TEST_TOUCH_ACCEPTANCE_TIME: Int = 200 + const val TEST_A11Y_AUTO_DISMISS_TIME: Int = 1000 + const val TEST_EXTENSION_TIME = 500 + + const val TEST_MINIMUM_DISPLAY_TIME: Int = 400 + const val TEST_AUTO_DISMISS_TIME: Int = 600 + const val TEST_STICKY_AUTO_DISMISS_TIME: Int = 800 + + // Number of notifications to use in tests requiring multiple notifications + private const val TEST_NUM_NOTIFICATIONS = 4 + + init { + Truth.assertThat(TEST_MINIMUM_DISPLAY_TIME).isLessThan(TEST_AUTO_DISMISS_TIME) + Truth.assertThat(TEST_AUTO_DISMISS_TIME).isLessThan(TEST_STICKY_AUTO_DISMISS_TIME) + Truth.assertThat(TEST_STICKY_AUTO_DISMISS_TIME).isLessThan(TEST_A11Y_AUTO_DISMISS_TIME) + } + + @get:Parameters(name = "{0}") + @JvmStatic + val flags: List<FlagsParameterization> + get() = FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME) + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.java deleted file mode 100644 index 01f78cb289fd..000000000000 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.java +++ /dev/null @@ -1,664 +0,0 @@ -/* - * Copyright (C) 2019 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.headsup; - -import static android.app.Notification.FLAG_FSI_REQUESTED_BUT_DENIED; - -import static com.android.systemui.log.LogBufferHelperKt.logcatLogBuffer; - -import static com.google.common.truth.Truth.assertThat; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; - -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import static kotlinx.coroutines.flow.StateFlowKt.MutableStateFlow; - -import android.app.Notification; -import android.app.PendingIntent; -import android.app.Person; -import android.os.Handler; -import android.platform.test.annotations.DisableFlags; -import android.platform.test.annotations.EnableFlags; -import android.platform.test.flag.junit.FlagsParameterization; -import android.testing.TestableLooper; - -import androidx.test.filters.SmallTest; - -import com.android.internal.logging.testing.UiEventLoggerFake; -import com.android.systemui.SysuiTestCase; -import com.android.systemui.dump.DumpManager; -import com.android.systemui.kosmos.KosmosJavaAdapter; -import com.android.systemui.res.R; -import com.android.systemui.shade.domain.interactor.ShadeInteractor; -import com.android.systemui.statusbar.notification.collection.NotificationEntry; -import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; -import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManagerImpl; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; -import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun; -import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper; -import com.android.systemui.util.concurrency.FakeExecutor; -import com.android.systemui.util.kotlin.JavaAdapter; -import com.android.systemui.util.settings.FakeGlobalSettings; -import com.android.systemui.util.time.FakeSystemClock; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnit; -import org.mockito.junit.MockitoRule; - -import kotlinx.coroutines.flow.StateFlowKt; -import platform.test.runner.parameterized.ParameterizedAndroidJunit4; -import platform.test.runner.parameterized.Parameters; - -import java.util.List; - -@SmallTest -@TestableLooper.RunWithLooper -@RunWith(ParameterizedAndroidJunit4.class) -// TODO(b/378142453): Merge this with HeadsUpManagerPhoneTest. -public class HeadsUpManagerImplTest extends SysuiTestCase { - protected KosmosJavaAdapter mKosmos = new KosmosJavaAdapter(this); - - @Rule - public MockitoRule rule = MockitoJUnit.rule(); - - static final int TEST_TOUCH_ACCEPTANCE_TIME = 200; - static final int TEST_A11Y_AUTO_DISMISS_TIME = 1_000; - - private UiEventLoggerFake mUiEventLoggerFake = new UiEventLoggerFake(); - - private final HeadsUpManagerLogger mLogger = spy(new HeadsUpManagerLogger(logcatLogBuffer())); - @Mock private Handler mBgHandler; - @Mock private DumpManager dumpManager; - @Mock private ShadeInteractor mShadeInteractor; - private AvalancheController mAvalancheController; - - @Mock private AccessibilityManagerWrapper mAccessibilityMgr; - - protected static final int TEST_MINIMUM_DISPLAY_TIME = 400; - protected static final int TEST_AUTO_DISMISS_TIME = 600; - protected static final int TEST_STICKY_AUTO_DISMISS_TIME = 800; - // Number of notifications to use in tests requiring multiple notifications - private static final int TEST_NUM_NOTIFICATIONS = 4; - - protected final FakeGlobalSettings mGlobalSettings = new FakeGlobalSettings(); - protected final FakeSystemClock mSystemClock = new FakeSystemClock(); - protected final FakeExecutor mExecutor = new FakeExecutor(mSystemClock); - - @Mock protected ExpandableNotificationRow mRow; - - static { - assertThat(TEST_MINIMUM_DISPLAY_TIME).isLessThan(TEST_AUTO_DISMISS_TIME); - assertThat(TEST_AUTO_DISMISS_TIME).isLessThan(TEST_STICKY_AUTO_DISMISS_TIME); - assertThat(TEST_STICKY_AUTO_DISMISS_TIME).isLessThan(TEST_A11Y_AUTO_DISMISS_TIME); - } - - private HeadsUpManagerImpl createHeadsUpManager() { - return new TestableHeadsUpManager( - mContext, - mLogger, - mKosmos.getStatusBarStateController(), - mKosmos.getKeyguardBypassController(), - new GroupMembershipManagerImpl(), - mKosmos.getVisualStabilityProvider(), - mKosmos.getConfigurationController(), - mExecutor, - mGlobalSettings, - mSystemClock, - mAccessibilityMgr, - mUiEventLoggerFake, - new JavaAdapter(mKosmos.getTestScope()), - mShadeInteractor, - mAvalancheController); - } - - private NotificationEntry createStickyEntry(int id) { - final Notification notif = new Notification.Builder(mContext, "") - .setSmallIcon(R.drawable.ic_person) - .setFullScreenIntent(mock(PendingIntent.class), /* highPriority */ true) - .build(); - return HeadsUpManagerTestUtil.createEntry(id, notif); - } - - private NotificationEntry createStickyForSomeTimeEntry(int id) { - final Notification notif = new Notification.Builder(mContext, "") - .setSmallIcon(R.drawable.ic_person) - .setFlag(FLAG_FSI_REQUESTED_BUT_DENIED, true) - .build(); - return HeadsUpManagerTestUtil.createEntry(id, notif); - } - - private void useAccessibilityTimeout(boolean use) { - if (use) { - doReturn(TEST_A11Y_AUTO_DISMISS_TIME).when(mAccessibilityMgr) - .getRecommendedTimeoutMillis(anyInt(), anyInt()); - } else { - when(mAccessibilityMgr.getRecommendedTimeoutMillis(anyInt(), anyInt())).then( - i -> i.getArgument(0)); - } - } - - @Parameters(name = "{0}") - public static List<FlagsParameterization> getFlags() { - return FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME); - } - - public HeadsUpManagerImplTest(FlagsParameterization flags) { - mSetFlagsRule.setFlagsParameterization(flags); - } - - @Override - public void SysuiSetup() throws Exception { - super.SysuiSetup(); - mAvalancheController = new AvalancheController(dumpManager, mUiEventLoggerFake, mLogger, - mBgHandler); - when(mShadeInteractor.isAnyExpanded()).thenReturn(MutableStateFlow(true)); - when(mKosmos.getKeyguardBypassController().getBypassEnabled()).thenReturn(false); - } - - @Test - public void testHasNotifications_headsUpManagerMapNotEmpty_true() { - final HeadsUpManagerImpl bhum = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - bhum.showNotification(entry); - - assertThat(bhum.mHeadsUpEntryMap).isNotEmpty(); - assertThat(bhum.hasNotifications()).isTrue(); - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - public void testHasNotifications_avalancheMapNotEmpty_true() { - final HeadsUpManagerImpl bhum = createHeadsUpManager(); - final NotificationEntry notifEntry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, - mContext); - final HeadsUpManagerImpl.HeadsUpEntry headsUpEntry = bhum.createHeadsUpEntry(notifEntry); - mAvalancheController.addToNext(headsUpEntry, () -> {}); - - assertThat(mAvalancheController.getWaitingEntryList()).isNotEmpty(); - assertThat(bhum.hasNotifications()).isTrue(); - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - public void testHasNotifications_false() { - final HeadsUpManagerImpl bhum = createHeadsUpManager(); - assertThat(bhum.mHeadsUpEntryMap).isEmpty(); - assertThat(mAvalancheController.getWaitingEntryList()).isEmpty(); - assertThat(bhum.hasNotifications()).isFalse(); - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - public void testGetHeadsUpEntryList_includesAvalancheEntryList() { - final HeadsUpManagerImpl bhum = createHeadsUpManager(); - final NotificationEntry notifEntry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, - mContext); - final HeadsUpManagerImpl.HeadsUpEntry headsUpEntry = bhum.createHeadsUpEntry(notifEntry); - mAvalancheController.addToNext(headsUpEntry, () -> {}); - - assertThat(bhum.getHeadsUpEntryList()).contains(headsUpEntry); - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - public void testGetHeadsUpEntry_returnsAvalancheEntry() { - final HeadsUpManagerImpl bhum = createHeadsUpManager(); - final NotificationEntry notifEntry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, - mContext); - final HeadsUpManagerImpl.HeadsUpEntry headsUpEntry = bhum.createHeadsUpEntry(notifEntry); - mAvalancheController.addToNext(headsUpEntry, () -> {}); - - assertThat(bhum.getHeadsUpEntry(notifEntry.getKey())).isEqualTo(headsUpEntry); - } - - @Test - public void testShowNotification_addsEntry() { - final HeadsUpManagerImpl alm = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - - alm.showNotification(entry); - - assertTrue(alm.isHeadsUpEntry(entry.getKey())); - assertTrue(alm.hasNotifications()); - assertEquals(entry, alm.getEntry(entry.getKey())); - } - - @Test - public void testShowNotification_autoDismisses() { - final HeadsUpManagerImpl alm = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - - alm.showNotification(entry); - mSystemClock.advanceTime(TEST_AUTO_DISMISS_TIME * 3 / 2); - - assertFalse(alm.isHeadsUpEntry(entry.getKey())); - } - - @Test - public void testRemoveNotification_removeDeferred() { - final HeadsUpManagerImpl alm = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - - alm.showNotification(entry); - - final boolean removedImmediately = alm.removeNotification( - entry.getKey(), /* releaseImmediately = */ false, "removeDeferred"); - assertFalse(removedImmediately); - assertTrue(alm.isHeadsUpEntry(entry.getKey())); - } - - @Test - public void testRemoveNotification_forceRemove() { - final HeadsUpManagerImpl alm = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - - alm.showNotification(entry); - - final boolean removedImmediately = alm.removeNotification( - entry.getKey(), /* releaseImmediately = */ true, "forceRemove"); - assertTrue(removedImmediately); - assertFalse(alm.isHeadsUpEntry(entry.getKey())); - } - - @Test - public void testReleaseAllImmediately() { - final HeadsUpManagerImpl alm = createHeadsUpManager(); - for (int i = 0; i < TEST_NUM_NOTIFICATIONS; i++) { - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(i, mContext); - entry.setRow(mRow); - alm.showNotification(entry); - } - - alm.releaseAllImmediately(); - - assertEquals(0, alm.getAllEntries().count()); - } - - @Test - public void testCanRemoveImmediately_notShownLongEnough() { - final HeadsUpManagerImpl alm = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - - alm.showNotification(entry); - - // The entry has just been added so we should not remove immediately. - assertFalse(alm.canRemoveImmediately(entry.getKey())); - } - - @Test - public void testHunRemovedLogging() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry notifEntry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, - mContext); - final HeadsUpManagerImpl.HeadsUpEntry headsUpEntry = mock( - HeadsUpManagerImpl.HeadsUpEntry.class); - when(headsUpEntry.getPinnedStatus()) - .thenReturn(StateFlowKt.MutableStateFlow(PinnedStatus.NotPinned)); - headsUpEntry.mEntry = notifEntry; - - hum.onEntryRemoved(headsUpEntry, "test"); - - verify(mLogger, times(1)).logNotificationActuallyRemoved(eq(notifEntry)); - } - - - @Test - public void testShowNotification_autoDismissesIncludingTouchAcceptanceDelay() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - useAccessibilityTimeout(false); - - hum.showNotification(entry); - mSystemClock.advanceTime(TEST_TOUCH_ACCEPTANCE_TIME / 2 + TEST_AUTO_DISMISS_TIME); - - assertTrue(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testShowNotification_autoDismissesWithDefaultTimeout() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - useAccessibilityTimeout(false); - - hum.showNotification(entry); - mSystemClock.advanceTime(TEST_TOUCH_ACCEPTANCE_TIME - + (TEST_AUTO_DISMISS_TIME + TEST_A11Y_AUTO_DISMISS_TIME) / 2); - - assertFalse(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testShowNotification_stickyForSomeTime_autoDismissesWithStickyTimeout() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = createStickyForSomeTimeEntry(/* id = */ 0); - useAccessibilityTimeout(false); - - hum.showNotification(entry); - mSystemClock.advanceTime(TEST_TOUCH_ACCEPTANCE_TIME - + (TEST_AUTO_DISMISS_TIME + TEST_STICKY_AUTO_DISMISS_TIME) / 2); - - assertTrue(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testShowNotification_sticky_neverAutoDismisses() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = createStickyEntry(/* id = */ 0); - useAccessibilityTimeout(false); - - hum.showNotification(entry); - mSystemClock.advanceTime(TEST_TOUCH_ACCEPTANCE_TIME + 2 * TEST_A11Y_AUTO_DISMISS_TIME); - - assertTrue(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testShowNotification_autoDismissesWithAccessibilityTimeout() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - useAccessibilityTimeout(true); - - hum.showNotification(entry); - mSystemClock.advanceTime(TEST_TOUCH_ACCEPTANCE_TIME - + (TEST_AUTO_DISMISS_TIME + TEST_A11Y_AUTO_DISMISS_TIME) / 2); - - assertTrue(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testShowNotification_stickyForSomeTime_autoDismissesWithAccessibilityTimeout() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = createStickyForSomeTimeEntry(/* id = */ 0); - useAccessibilityTimeout(true); - - hum.showNotification(entry); - mSystemClock.advanceTime(TEST_TOUCH_ACCEPTANCE_TIME - + (TEST_STICKY_AUTO_DISMISS_TIME + TEST_A11Y_AUTO_DISMISS_TIME) / 2); - - assertTrue(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testRemoveNotification_beforeMinimumDisplayTime() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - useAccessibilityTimeout(false); - - hum.showNotification(entry); - - final boolean removedImmediately = hum.removeNotification( - entry.getKey(), /* releaseImmediately = */ false, "beforeMinimumDisplayTime"); - assertFalse(removedImmediately); - assertTrue(hum.isHeadsUpEntry(entry.getKey())); - - mSystemClock.advanceTime((TEST_MINIMUM_DISPLAY_TIME + TEST_AUTO_DISMISS_TIME) / 2); - - assertFalse(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testRemoveNotification_afterMinimumDisplayTime() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - useAccessibilityTimeout(false); - - hum.showNotification(entry); - mSystemClock.advanceTime((TEST_MINIMUM_DISPLAY_TIME + TEST_AUTO_DISMISS_TIME) / 2); - - assertTrue(hum.isHeadsUpEntry(entry.getKey())); - - final boolean removedImmediately = hum.removeNotification( - entry.getKey(), /* releaseImmediately = */ false, "afterMinimumDisplayTime"); - assertTrue(removedImmediately); - assertFalse(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testRemoveNotification_releaseImmediately() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, mContext); - - hum.showNotification(entry); - - final boolean removedImmediately = hum.removeNotification( - entry.getKey(), /* releaseImmediately = */ true, "afterMinimumDisplayTime"); - assertTrue(removedImmediately); - assertFalse(hum.isHeadsUpEntry(entry.getKey())); - } - - - @Test - public void testIsSticky_rowPinnedAndExpanded_true() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry notifEntry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, - mContext); - when(mRow.isPinned()).thenReturn(true); - notifEntry.setRow(mRow); - - hum.showNotification(notifEntry); - - final HeadsUpManagerImpl.HeadsUpEntry headsUpEntry = hum.getHeadsUpEntry( - notifEntry.getKey()); - headsUpEntry.setExpanded(true); - - assertTrue(hum.isSticky(notifEntry.getKey())); - } - - @Test - public void testIsSticky_remoteInputActive_true() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry notifEntry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, - mContext); - - hum.showNotification(notifEntry); - - final HeadsUpManagerImpl.HeadsUpEntry headsUpEntry = hum.getHeadsUpEntry( - notifEntry.getKey()); - headsUpEntry.mRemoteInputActive = true; - - assertTrue(hum.isSticky(notifEntry.getKey())); - } - - @Test - public void testIsSticky_hasFullScreenIntent_true() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry notifEntry = - HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id = */ 0, mContext); - - hum.showNotification(notifEntry); - - assertTrue(hum.isSticky(notifEntry.getKey())); - } - - - @Test - public void testIsSticky_stickyForSomeTime_false() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry entry = createStickyForSomeTimeEntry(/* id = */ 0); - - hum.showNotification(entry); - - assertFalse(hum.isSticky(entry.getKey())); - } - - - @Test - public void testIsSticky_false() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry notifEntry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, - mContext); - - hum.showNotification(notifEntry); - - final HeadsUpManagerImpl.HeadsUpEntry headsUpEntry = hum.getHeadsUpEntry( - notifEntry.getKey()); - headsUpEntry.setExpanded(false); - headsUpEntry.mRemoteInputActive = false; - - assertFalse(hum.isSticky(notifEntry.getKey())); - } - - @Test - public void testCompareTo_withNullEntries() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry alertEntry = new NotificationEntryBuilder().setTag("alert").build(); - - hum.showNotification(alertEntry); - - assertThat(hum.compare(alertEntry, null)).isLessThan(0); - assertThat(hum.compare(null, alertEntry)).isGreaterThan(0); - assertThat(hum.compare(null, null)).isEqualTo(0); - } - - @Test - public void testCompareTo_withNonAlertEntries() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - - final NotificationEntry nonAlertEntry1 = new NotificationEntryBuilder().setTag( - "nae1").build(); - final NotificationEntry nonAlertEntry2 = new NotificationEntryBuilder().setTag( - "nae2").build(); - final NotificationEntry alertEntry = new NotificationEntryBuilder().setTag("alert").build(); - hum.showNotification(alertEntry); - - assertThat(hum.compare(alertEntry, nonAlertEntry1)).isLessThan(0); - assertThat(hum.compare(nonAlertEntry1, alertEntry)).isGreaterThan(0); - assertThat(hum.compare(nonAlertEntry1, nonAlertEntry2)).isEqualTo(0); - } - - @Test - public void testAlertEntryCompareTo_ongoingCallLessThanActiveRemoteInput() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - - final HeadsUpManagerImpl.HeadsUpEntry ongoingCall = hum.new HeadsUpEntry( - new NotificationEntryBuilder() - .setSbn(HeadsUpManagerTestUtil.createSbn(/* id = */ 0, - new Notification.Builder(mContext, "") - .setCategory(Notification.CATEGORY_CALL) - .setOngoing(true))) - .build()); - - final HeadsUpManagerImpl.HeadsUpEntry activeRemoteInput = hum.new HeadsUpEntry( - HeadsUpManagerTestUtil.createEntry(/* id = */ 1, mContext)); - activeRemoteInput.mRemoteInputActive = true; - - assertThat(ongoingCall.compareTo(activeRemoteInput)).isLessThan(0); - assertThat(activeRemoteInput.compareTo(ongoingCall)).isGreaterThan(0); - } - - @Test - public void testAlertEntryCompareTo_incomingCallLessThanActiveRemoteInput() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - - final Person person = new Person.Builder().setName("person").build(); - final PendingIntent intent = mock(PendingIntent.class); - final HeadsUpManagerImpl.HeadsUpEntry incomingCall = hum.new HeadsUpEntry( - new NotificationEntryBuilder() - .setSbn(HeadsUpManagerTestUtil.createSbn(/* id = */ 0, - new Notification.Builder(mContext, "") - .setStyle(Notification.CallStyle - .forIncomingCall(person, intent, intent)))) - .build()); - - final HeadsUpManagerImpl.HeadsUpEntry activeRemoteInput = hum.new HeadsUpEntry( - HeadsUpManagerTestUtil.createEntry(/* id = */ 1, mContext)); - activeRemoteInput.mRemoteInputActive = true; - - assertThat(incomingCall.compareTo(activeRemoteInput)).isLessThan(0); - assertThat(activeRemoteInput.compareTo(incomingCall)).isGreaterThan(0); - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - public void testPinEntry_logsPeek_throttleEnabled() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - - // Needs full screen intent in order to be pinned - final HeadsUpManagerImpl.HeadsUpEntry entryToPin = hum.new HeadsUpEntry( - HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id = */ 0, mContext)); - - // Note: the standard way to show a notification would be calling showNotification rather - // than onAlertEntryAdded. However, in practice showNotification in effect adds - // the notification and then updates it; in order to not log twice, the entry needs - // to have a functional ExpandableNotificationRow that can keep track of whether it's - // pinned or not (via isRowPinned()). That feels like a lot to pull in to test this one bit. - hum.onEntryAdded(entryToPin); - - assertEquals(2, mUiEventLoggerFake.numLogs()); - assertEquals(AvalancheController.ThrottleEvent.AVALANCHE_THROTTLING_HUN_SHOWN.getId(), - mUiEventLoggerFake.eventId(0)); - assertEquals(HeadsUpManagerImpl.NotificationPeekEvent.NOTIFICATION_PEEK.getId(), - mUiEventLoggerFake.eventId(1)); - } - - @Test - @DisableFlags(NotificationThrottleHun.FLAG_NAME) - public void testPinEntry_logsPeek_throttleDisabled() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - - // Needs full screen intent in order to be pinned - final HeadsUpManagerImpl.HeadsUpEntry entryToPin = hum.new HeadsUpEntry( - HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id = */ 0, mContext)); - - // Note: the standard way to show a notification would be calling showNotification rather - // than onAlertEntryAdded. However, in practice showNotification in effect adds - // the notification and then updates it; in order to not log twice, the entry needs - // to have a functional ExpandableNotificationRow that can keep track of whether it's - // pinned or not (via isRowPinned()). That feels like a lot to pull in to test this one bit. - hum.onEntryAdded(entryToPin); - - assertEquals(1, mUiEventLoggerFake.numLogs()); - assertEquals(HeadsUpManagerImpl.NotificationPeekEvent.NOTIFICATION_PEEK.getId(), - mUiEventLoggerFake.eventId(0)); - } - - @Test - public void testSetUserActionMayIndirectlyRemove() { - final HeadsUpManagerImpl hum = createHeadsUpManager(); - final NotificationEntry notifEntry = HeadsUpManagerTestUtil.createEntry(/* id = */ 0, - mContext); - - hum.showNotification(notifEntry); - - assertFalse(hum.canRemoveImmediately(notifEntry.getKey())); - - hum.setUserActionMayIndirectlyRemove(notifEntry); - - assertTrue(hum.canRemoveImmediately(notifEntry.getKey())); - } -} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.kt new file mode 100644 index 000000000000..a5fecb8d0e8d --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImplTest.kt @@ -0,0 +1,360 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.statusbar.notification.headsup + +import android.os.Handler +import android.platform.test.annotations.EnableFlags +import android.platform.test.flag.junit.FlagsParameterization +import android.testing.TestableLooper.RunWithLooper +import android.view.accessibility.accessibilityManagerWrapper +import androidx.test.filters.SmallTest +import com.android.internal.logging.uiEventLoggerFake +import com.android.systemui.dump.dumpManager +import com.android.systemui.flags.andSceneContainer +import com.android.systemui.kosmos.runTest +import com.android.systemui.kosmos.testScope +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.log.logcatLogBuffer +import com.android.systemui.res.R +import com.android.systemui.shade.domain.interactor.shadeInteractor +import com.android.systemui.shade.shadeTestUtil +import com.android.systemui.statusbar.StatusBarState +import com.android.systemui.statusbar.notification.collection.provider.visualStabilityProvider +import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager +import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun +import com.android.systemui.statusbar.phone.keyguardBypassController +import com.android.systemui.statusbar.policy.configurationController +import com.android.systemui.statusbar.sysuiStatusBarStateController +import com.android.systemui.testKosmos +import com.android.systemui.util.concurrency.mockExecutorHandler +import com.android.systemui.util.kotlin.JavaAdapter +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Ignore +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever +import platform.test.runner.parameterized.ParameterizedAndroidJunit4 +import platform.test.runner.parameterized.Parameters + +@SmallTest +@RunWith(ParameterizedAndroidJunit4::class) +@RunWithLooper +class HeadsUpManagerImplTest(flags: FlagsParameterization) : HeadsUpManagerImplOldTest(flags) { + + private val headsUpManagerLogger = HeadsUpManagerLogger(logcatLogBuffer()) + + private val kosmos = testKosmos().useUnconfinedTestDispatcher() + private val testScope = kosmos.testScope + + private val groupManager = mock<GroupMembershipManager>() + private val bgHandler = mock<Handler>() + + val statusBarStateController = kosmos.sysuiStatusBarStateController + private val javaAdapter: JavaAdapter = JavaAdapter(testScope.backgroundScope) + + private lateinit var avalancheController: AvalancheController + private lateinit var underTest: HeadsUpManagerImpl + + @Before + fun setUp() { + mContext.getOrCreateTestableResources().apply { + this.addOverride(R.integer.ambient_notification_extension_time, TEST_EXTENSION_TIME) + this.addOverride(R.integer.touch_acceptance_delay, TEST_TOUCH_ACCEPTANCE_TIME) + this.addOverride( + R.integer.heads_up_notification_minimum_time, + TEST_MINIMUM_DISPLAY_TIME, + ) + this.addOverride( + R.integer.heads_up_notification_minimum_time_with_throttling, + TEST_MINIMUM_DISPLAY_TIME, + ) + this.addOverride(R.integer.heads_up_notification_decay, TEST_AUTO_DISMISS_TIME) + this.addOverride( + R.integer.sticky_heads_up_notification_time, + TEST_STICKY_AUTO_DISMISS_TIME, + ) + } + + whenever(kosmos.keyguardBypassController.bypassEnabled).thenReturn(false) + kosmos.visualStabilityProvider.isReorderingAllowed = true + avalancheController = + AvalancheController( + kosmos.dumpManager, + kosmos.uiEventLoggerFake, + headsUpManagerLogger, + bgHandler, + ) + underTest = + HeadsUpManagerImpl( + mContext, + headsUpManagerLogger, + statusBarStateController, + kosmos.keyguardBypassController, + groupManager, + kosmos.visualStabilityProvider, + kosmos.configurationController, + mockExecutorHandler(executor), + globalSettings, + systemClock, + executor, + kosmos.accessibilityManagerWrapper, + kosmos.uiEventLoggerFake, + javaAdapter, + kosmos.shadeInteractor, + avalancheController, + ) + } + + @Test + fun testSnooze() { + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + underTest.showNotification(entry) + underTest.snooze() + assertThat(underTest.isSnoozed(entry.sbn.packageName)).isTrue() + } + + @Test + fun testSwipedOutNotification() { + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + underTest.showNotification(entry) + underTest.addSwipedOutNotification(entry.key) + + // Remove should succeed because the notification is swiped out + val removedImmediately = + underTest.removeNotification( + entry.key, + /* releaseImmediately= */ false, + /* reason= */ "swipe out", + ) + assertThat(removedImmediately).isTrue() + assertThat(underTest.isHeadsUpEntry(entry.key)).isFalse() + } + + @Test + fun testCanRemoveImmediately_swipedOut() { + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + underTest.showNotification(entry) + underTest.addSwipedOutNotification(entry.key) + + // Notification is swiped so it can be immediately removed. + assertThat(underTest.canRemoveImmediately(entry.key)).isTrue() + } + + @Ignore("b/141538055") + @Test + fun testCanRemoveImmediately_notTopEntry() { + val earlierEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + val laterEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 1, mContext) + laterEntry.row = mRow + underTest.showNotification(earlierEntry) + underTest.showNotification(laterEntry) + + // Notification is "behind" a higher priority notification so we can remove it immediately. + assertThat(underTest.canRemoveImmediately(earlierEntry.key)).isTrue() + } + + @Test + fun testExtendHeadsUp() { + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + underTest.showNotification(entry) + underTest.extendHeadsUp() + systemClock.advanceTime(((TEST_AUTO_DISMISS_TIME + TEST_EXTENSION_TIME) / 2).toLong()) + assertThat(underTest.isHeadsUpEntry(entry.key)).isTrue() + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testShowNotification_removeWhenReorderingAllowedTrue() { + kosmos.visualStabilityProvider.isReorderingAllowed = true + + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + underTest.showNotification(notifEntry) + assertThat(underTest.mEntriesToRemoveWhenReorderingAllowed.contains(notifEntry)).isTrue() + } + + class TestAnimationStateHandler : AnimationStateHandler { + override fun setHeadsUpGoingAwayAnimationsAllowed(allowed: Boolean) {} + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testReorderingAllowed_clearsListOfEntriesToRemove() { + kosmos.visualStabilityProvider.isReorderingAllowed = true + + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + underTest.showNotification(notifEntry) + assertThat(underTest.mEntriesToRemoveWhenReorderingAllowed.contains(notifEntry)).isTrue() + + underTest.setAnimationStateHandler(TestAnimationStateHandler()) + underTest.mOnReorderingAllowedListener.onReorderingAllowed() + assertThat(underTest.mEntriesToRemoveWhenReorderingAllowed.isEmpty()).isTrue() + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testShowNotification_reorderNotAllowed_seenInShadeTrue() { + kosmos.visualStabilityProvider.isReorderingAllowed = false + + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + underTest.showNotification(notifEntry) + assertThat(notifEntry.isSeenInShade).isTrue() + } + + @Test + @EnableFlags(NotificationThrottleHun.FLAG_NAME) + fun testShowNotification_reorderAllowed_seenInShadeFalse() { + kosmos.visualStabilityProvider.isReorderingAllowed = true + + val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + underTest.showNotification(notifEntry) + assertThat(notifEntry.isSeenInShade).isFalse() + } + + @Test + fun testShouldHeadsUpBecomePinned_noFSI_false() = + kosmos.runTest { + statusBarStateController.setState(StatusBarState.KEYGUARD) + + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + + assertThat(underTest.shouldHeadsUpBecomePinned(entry)).isFalse() + } + + @Test + fun testShouldHeadsUpBecomePinned_hasFSI_notUnpinned_true() = + kosmos.runTest { + statusBarStateController.setState(StatusBarState.KEYGUARD) + + val notifEntry = + HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id= */ 0, mContext) + + // Add notifEntry to ANM mAlertEntries map and make it NOT unpinned + underTest.showNotification(notifEntry) + + val headsUpEntry = underTest.getHeadsUpEntry(notifEntry.key) + headsUpEntry!!.mWasUnpinned = false + + assertThat(underTest.shouldHeadsUpBecomePinned(notifEntry)).isTrue() + } + + @Test + fun testShouldHeadsUpBecomePinned_wasUnpinned_false() = + kosmos.runTest { + statusBarStateController.setState(StatusBarState.KEYGUARD) + + val notifEntry = + HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id= */ 0, mContext) + + // Add notifEntry to ANM mAlertEntries map and make it unpinned + underTest.showNotification(notifEntry) + + val headsUpEntry = underTest.getHeadsUpEntry(notifEntry.key) + headsUpEntry!!.mWasUnpinned = true + + assertThat(underTest.shouldHeadsUpBecomePinned(notifEntry)).isFalse() + } + + @Test + fun shouldHeadsUpBecomePinned_shadeNotExpanded_true() = + kosmos.runTest { + // GIVEN + shadeTestUtil.setShadeExpansion(0f) + // TODO(b/381869885): Determine why we need both of these ShadeTestUtil calls. + shadeTestUtil.setLegacyExpandedOrAwaitingInputTransfer(false) + + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + statusBarStateController.setState(StatusBarState.SHADE) + + // THEN + assertThat(underTest.shouldHeadsUpBecomePinned(entry)).isTrue() + } + + @Test + fun shouldHeadsUpBecomePinned_shadeLocked_false() = + kosmos.runTest { + // GIVEN + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + statusBarStateController.setState(StatusBarState.SHADE_LOCKED) + + // THEN + assertThat(underTest.shouldHeadsUpBecomePinned(entry)).isFalse() + } + + @Test + fun shouldHeadsUpBecomePinned_shadeUnknown_false() = + kosmos.runTest { + // GIVEN + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + statusBarStateController.setState(1207) + + // THEN + assertThat(underTest.shouldHeadsUpBecomePinned(entry)).isFalse() + } + + @Test + fun shouldHeadsUpBecomePinned_keyguardWithBypassOn_true() = + kosmos.runTest { + // GIVEN + whenever(keyguardBypassController.bypassEnabled).thenReturn(true) + + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + statusBarStateController.setState(StatusBarState.KEYGUARD) + + // THEN + assertThat(underTest.shouldHeadsUpBecomePinned(entry)).isTrue() + } + + @Test + fun shouldHeadsUpBecomePinned_keyguardWithBypassOff_false() = + kosmos.runTest { + // GIVEN + whenever(keyguardBypassController.bypassEnabled).thenReturn(false) + + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + statusBarStateController.setState(StatusBarState.KEYGUARD) + + // THEN + assertThat(underTest.shouldHeadsUpBecomePinned(entry)).isFalse() + } + + @Test + fun shouldHeadsUpBecomePinned_shadeExpanded_false() = + kosmos.runTest { + // GIVEN + shadeTestUtil.setShadeExpansion(1f) + // TODO(b/381869885): Determine why we need both of these ShadeTestUtil calls. + shadeTestUtil.setLegacyExpandedOrAwaitingInputTransfer(true) + + val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) + statusBarStateController.setState(StatusBarState.SHADE) + + // THEN + assertThat(underTest.shouldHeadsUpBecomePinned(entry)).isFalse() + } + + companion object { + @get:Parameters(name = "{0}") + val flags: List<FlagsParameterization> + get() = buildList { + addAll( + FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME) + .andSceneContainer() + ) + } + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerPhoneTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerPhoneTest.kt deleted file mode 100644 index 35d825310fdc..000000000000 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerPhoneTest.kt +++ /dev/null @@ -1,388 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.systemui.statusbar.notification.headsup - -import android.os.Handler -import android.platform.test.annotations.EnableFlags -import android.platform.test.flag.junit.FlagsParameterization -import android.testing.TestableLooper.RunWithLooper -import androidx.test.filters.SmallTest -import com.android.internal.logging.UiEventLogger -import com.android.systemui.dump.DumpManager -import com.android.systemui.flags.andSceneContainer -import com.android.systemui.kosmos.testScope -import com.android.systemui.log.logcatLogBuffer -import com.android.systemui.res.R -import com.android.systemui.shade.domain.interactor.ShadeInteractor -import com.android.systemui.statusbar.FakeStatusBarStateController -import com.android.systemui.statusbar.NotificationShadeWindowController -import com.android.systemui.statusbar.StatusBarState -import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider -import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager -import com.android.systemui.statusbar.notification.shared.NotificationThrottleHun -import com.android.systemui.statusbar.phone.ConfigurationControllerImpl -import com.android.systemui.statusbar.phone.KeyguardBypassController -import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper -import com.android.systemui.testKosmos -import com.android.systemui.util.concurrency.mockExecutorHandler -import com.android.systemui.util.kotlin.JavaAdapter -import com.google.common.truth.Truth.assertThat -import junit.framework.Assert -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.test.runCurrent -import kotlinx.coroutines.test.runTest -import org.junit.Before -import org.junit.Ignore -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.ArgumentMatchers -import org.mockito.Mock -import org.mockito.kotlin.whenever -import platform.test.runner.parameterized.ParameterizedAndroidJunit4 -import platform.test.runner.parameterized.Parameters - -@OptIn(ExperimentalCoroutinesApi::class) -@SmallTest -@RunWith(ParameterizedAndroidJunit4::class) -@RunWithLooper -class HeadsUpManagerPhoneTest(flags: FlagsParameterization) : HeadsUpManagerImplTest(flags) { - - private val mHeadsUpManagerLogger = HeadsUpManagerLogger(logcatLogBuffer()) - - private val kosmos = testKosmos() - private val testScope = kosmos.testScope - - @Mock private lateinit var mGroupManager: GroupMembershipManager - - @Mock private lateinit var mVSProvider: VisualStabilityProvider - - val statusBarStateController = FakeStatusBarStateController() - - @Mock private lateinit var mBypassController: KeyguardBypassController - - @Mock private lateinit var mConfigurationController: ConfigurationControllerImpl - - @Mock private lateinit var mAccessibilityManagerWrapper: AccessibilityManagerWrapper - - @Mock private lateinit var mUiEventLogger: UiEventLogger - - private val mJavaAdapter: JavaAdapter = JavaAdapter(testScope.backgroundScope) - - @Mock private lateinit var mShadeInteractor: ShadeInteractor - @Mock private lateinit var dumpManager: DumpManager - private lateinit var mAvalancheController: AvalancheController - - @Mock private lateinit var mBgHandler: Handler - - private fun createHeadsUpManagerPhone(): HeadsUpManagerImpl { - return HeadsUpManagerImpl( - mContext, - mHeadsUpManagerLogger, - statusBarStateController, - mBypassController, - mGroupManager, - mVSProvider, - mConfigurationController, - mockExecutorHandler(mExecutor), - mGlobalSettings, - mSystemClock, - mExecutor, - mAccessibilityManagerWrapper, - mUiEventLogger, - mJavaAdapter, - mShadeInteractor, - mAvalancheController, - ) - } - - @Before - fun setUp() { - whenever(mShadeInteractor.isAnyExpanded).thenReturn(MutableStateFlow(false)) - whenever(mShadeInteractor.isQsExpanded).thenReturn(MutableStateFlow(false)) - whenever(mBypassController.bypassEnabled).thenReturn(false) - whenever(mVSProvider.isReorderingAllowed).thenReturn(true) - val accessibilityMgr = - mDependency.injectMockDependency(AccessibilityManagerWrapper::class.java) - whenever( - accessibilityMgr.getRecommendedTimeoutMillis( - ArgumentMatchers.anyInt(), - ArgumentMatchers.anyInt(), - ) - ) - .thenReturn(TEST_AUTO_DISMISS_TIME) - mDependency.injectMockDependency(NotificationShadeWindowController::class.java) - mContext - .getOrCreateTestableResources() - .addOverride(R.integer.ambient_notification_extension_time, 500) - mAvalancheController = - AvalancheController(dumpManager, mUiEventLogger, mHeadsUpManagerLogger, mBgHandler) - } - - @Test - fun testSnooze() { - val hmp: HeadsUpManager = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - hmp.showNotification(entry) - hmp.snooze() - Assert.assertTrue(hmp.isSnoozed(entry.sbn.packageName)) - } - - @Test - fun testSwipedOutNotification() { - val hmp: HeadsUpManager = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - hmp.showNotification(entry) - hmp.addSwipedOutNotification(entry.key) - - // Remove should succeed because the notification is swiped out - val removedImmediately = - hmp.removeNotification( - entry.key, - /* releaseImmediately= */ false, - /* reason= */ "swipe out", - ) - Assert.assertTrue(removedImmediately) - Assert.assertFalse(hmp.isHeadsUpEntry(entry.key)) - } - - @Test - fun testCanRemoveImmediately_swipedOut() { - val hmp: HeadsUpManager = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - hmp.showNotification(entry) - hmp.addSwipedOutNotification(entry.key) - - // Notification is swiped so it can be immediately removed. - Assert.assertTrue(hmp.canRemoveImmediately(entry.key)) - } - - @Ignore("b/141538055") - @Test - fun testCanRemoveImmediately_notTopEntry() { - val hmp: HeadsUpManager = createHeadsUpManagerPhone() - val earlierEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - val laterEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 1, mContext) - laterEntry.row = mRow - hmp.showNotification(earlierEntry) - hmp.showNotification(laterEntry) - - // Notification is "behind" a higher priority notification so we can remove it immediately. - Assert.assertTrue(hmp.canRemoveImmediately(earlierEntry.key)) - } - - @Test - fun testExtendHeadsUp() { - val hmp = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - hmp.showNotification(entry) - hmp.extendHeadsUp() - mSystemClock.advanceTime((TEST_AUTO_DISMISS_TIME + hmp.mExtensionTime / 2).toLong()) - Assert.assertTrue(hmp.isHeadsUpEntry(entry.key)) - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - fun testShowNotification_removeWhenReorderingAllowedTrue() { - whenever(mVSProvider.isReorderingAllowed).thenReturn(true) - val hmp = createHeadsUpManagerPhone() - - val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - hmp.showNotification(notifEntry) - assertThat(hmp.mEntriesToRemoveWhenReorderingAllowed.contains(notifEntry)).isTrue() - } - - class TestAnimationStateHandler : AnimationStateHandler { - override fun setHeadsUpGoingAwayAnimationsAllowed(allowed: Boolean) {} - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - fun testReorderingAllowed_clearsListOfEntriesToRemove() { - whenever(mVSProvider.isReorderingAllowed).thenReturn(true) - val hmp = createHeadsUpManagerPhone() - - val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - hmp.showNotification(notifEntry) - assertThat(hmp.mEntriesToRemoveWhenReorderingAllowed.contains(notifEntry)).isTrue() - - hmp.setAnimationStateHandler(TestAnimationStateHandler()) - hmp.mOnReorderingAllowedListener.onReorderingAllowed() - assertThat(hmp.mEntriesToRemoveWhenReorderingAllowed.isEmpty()).isTrue() - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - fun testShowNotification_reorderNotAllowed_seenInShadeTrue() { - whenever(mVSProvider.isReorderingAllowed).thenReturn(false) - val hmp = createHeadsUpManagerPhone() - - val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - hmp.showNotification(notifEntry) - assertThat(notifEntry.isSeenInShade).isTrue() - } - - @Test - @EnableFlags(NotificationThrottleHun.FLAG_NAME) - fun testShowNotification_reorderAllowed_seenInShadeFalse() { - whenever(mVSProvider.isReorderingAllowed).thenReturn(true) - val hmp = createHeadsUpManagerPhone() - - val notifEntry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - hmp.showNotification(notifEntry) - assertThat(notifEntry.isSeenInShade).isFalse() - } - - @Test - fun testShouldHeadsUpBecomePinned_noFSI_false() = - testScope.runTest { - val hum = createHeadsUpManagerPhone() - statusBarStateController.setState(StatusBarState.KEYGUARD) - - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - - Assert.assertFalse(hum.shouldHeadsUpBecomePinned(entry)) - } - - @Test - fun testShouldHeadsUpBecomePinned_hasFSI_notUnpinned_true() = - testScope.runTest { - val hum = createHeadsUpManagerPhone() - statusBarStateController.setState(StatusBarState.KEYGUARD) - - val notifEntry = - HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id= */ 0, mContext) - - // Add notifEntry to ANM mAlertEntries map and make it NOT unpinned - hum.showNotification(notifEntry) - - val headsUpEntry = hum.getHeadsUpEntry(notifEntry.key) - headsUpEntry!!.mWasUnpinned = false - - Assert.assertTrue(hum.shouldHeadsUpBecomePinned(notifEntry)) - } - - @Test - fun testShouldHeadsUpBecomePinned_wasUnpinned_false() = - testScope.runTest { - val hum = createHeadsUpManagerPhone() - statusBarStateController.setState(StatusBarState.KEYGUARD) - - val notifEntry = - HeadsUpManagerTestUtil.createFullScreenIntentEntry(/* id= */ 0, mContext) - - // Add notifEntry to ANM mAlertEntries map and make it unpinned - hum.showNotification(notifEntry) - - val headsUpEntry = hum.getHeadsUpEntry(notifEntry.key) - headsUpEntry!!.mWasUnpinned = true - - Assert.assertFalse(hum.shouldHeadsUpBecomePinned(notifEntry)) - } - - @Test - fun shouldHeadsUpBecomePinned_shadeNotExpanded_true() = - testScope.runTest { - // GIVEN - whenever(mShadeInteractor.isAnyFullyExpanded).thenReturn(MutableStateFlow(false)) - val hmp = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - statusBarStateController.setState(StatusBarState.SHADE) - runCurrent() - - // THEN - Assert.assertTrue(hmp.shouldHeadsUpBecomePinned(entry)) - } - - @Test - fun shouldHeadsUpBecomePinned_shadeLocked_false() = - testScope.runTest { - // GIVEN - val hmp = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - statusBarStateController.setState(StatusBarState.SHADE_LOCKED) - runCurrent() - - // THEN - Assert.assertFalse(hmp.shouldHeadsUpBecomePinned(entry)) - } - - @Test - fun shouldHeadsUpBecomePinned_shadeUnknown_false() = - testScope.runTest { - // GIVEN - val hmp = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - statusBarStateController.setState(1207) - runCurrent() - - // THEN - Assert.assertFalse(hmp.shouldHeadsUpBecomePinned(entry)) - } - - @Test - fun shouldHeadsUpBecomePinned_keyguardWithBypassOn_true() = - testScope.runTest { - // GIVEN - whenever(mBypassController.bypassEnabled).thenReturn(true) - val hmp = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - statusBarStateController.setState(StatusBarState.KEYGUARD) - runCurrent() - - // THEN - Assert.assertTrue(hmp.shouldHeadsUpBecomePinned(entry)) - } - - @Test - fun shouldHeadsUpBecomePinned_keyguardWithBypassOff_false() = - testScope.runTest { - // GIVEN - whenever(mBypassController.bypassEnabled).thenReturn(false) - val hmp = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - statusBarStateController.setState(StatusBarState.KEYGUARD) - runCurrent() - - // THEN - Assert.assertFalse(hmp.shouldHeadsUpBecomePinned(entry)) - } - - @Test - fun shouldHeadsUpBecomePinned_shadeExpanded_false() = - testScope.runTest { - // GIVEN - whenever(mShadeInteractor.isAnyExpanded).thenReturn(MutableStateFlow(true)) - val hmp = createHeadsUpManagerPhone() - val entry = HeadsUpManagerTestUtil.createEntry(/* id= */ 0, mContext) - statusBarStateController.setState(StatusBarState.SHADE) - runCurrent() - - // THEN - Assert.assertFalse(hmp.shouldHeadsUpBecomePinned(entry)) - } - - companion object { - @get:Parameters(name = "{0}") - val flags: List<FlagsParameterization> - get() = buildList { - addAll( - FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME) - .andSceneContainer() - ) - } - } -} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/TestableHeadsUpManager.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/TestableHeadsUpManager.java deleted file mode 100644 index 2b077ed7f80d..000000000000 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/TestableHeadsUpManager.java +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.statusbar.notification.headsup; - -import static com.android.systemui.util.concurrency.MockExecutorHandlerKt.mockExecutorHandler; - -import static org.mockito.Mockito.spy; - -import android.content.Context; -import android.graphics.Region; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.android.internal.logging.UiEventLogger; -import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.shade.domain.interactor.ShadeInteractor; -import com.android.systemui.statusbar.notification.collection.NotificationEntry; -import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider; -import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; -import com.android.systemui.statusbar.phone.KeyguardBypassController; -import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper; -import com.android.systemui.statusbar.policy.ConfigurationController; -import com.android.systemui.util.concurrency.DelayableExecutor; -import com.android.systemui.util.kotlin.JavaAdapter; -import com.android.systemui.util.settings.GlobalSettings; -import com.android.systemui.util.time.SystemClock; - -class TestableHeadsUpManager extends HeadsUpManagerImpl { - - private HeadsUpEntry mLastCreatedEntry; - - TestableHeadsUpManager( - Context context, - HeadsUpManagerLogger logger, - StatusBarStateController statusBarStateController, - KeyguardBypassController bypassController, - GroupMembershipManager groupMembershipManager, - VisualStabilityProvider visualStabilityProvider, - ConfigurationController configurationController, - DelayableExecutor executor, - GlobalSettings globalSettings, - SystemClock systemClock, - AccessibilityManagerWrapper accessibilityManagerWrapper, - UiEventLogger uiEventLogger, - JavaAdapter javaAdapter, - ShadeInteractor shadeInteractor, - AvalancheController avalancheController) { - super( - context, - logger, - statusBarStateController, - bypassController, - groupMembershipManager, - visualStabilityProvider, - configurationController, - mockExecutorHandler(executor), - globalSettings, - systemClock, - executor, - accessibilityManagerWrapper, - uiEventLogger, - javaAdapter, - shadeInteractor, - avalancheController); - - mTouchAcceptanceDelay = HeadsUpManagerImplTest.TEST_TOUCH_ACCEPTANCE_TIME; - mMinimumDisplayTime = HeadsUpManagerImplTest.TEST_MINIMUM_DISPLAY_TIME; - mAutoDismissTime = HeadsUpManagerImplTest.TEST_AUTO_DISMISS_TIME; - mStickyForSomeTimeAutoDismissTime = HeadsUpManagerImplTest.TEST_STICKY_AUTO_DISMISS_TIME; - } - - @NonNull - @Override - protected HeadsUpEntry createHeadsUpEntry(NotificationEntry entry) { - mLastCreatedEntry = spy(super.createHeadsUpEntry(entry)); - return mLastCreatedEntry; - } - - // The following are only implemented by HeadsUpManagerPhone. If you need them, use that. - @Override - public void addHeadsUpPhoneListener(@NonNull OnHeadsUpPhoneListenerChange listener) { - throw new UnsupportedOperationException(); - } - - @Override - public void addSwipedOutNotification(@NonNull String key) { - throw new UnsupportedOperationException(); - } - - @Override - public void extendHeadsUp() { - throw new UnsupportedOperationException(); - } - - @Nullable - @Override - public Region getTouchableRegion() { - throw new UnsupportedOperationException(); - } - - @Override - public boolean isHeadsUpAnimatingAwayValue() { - throw new UnsupportedOperationException(); - } - - @Override - public void onExpandingFinished() { - throw new UnsupportedOperationException(); - } - - @Override - public boolean removeNotification(@NonNull String key, boolean releaseImmediately, - boolean animate, @NonNull String reason) { - throw new UnsupportedOperationException(); - } - - @Override - public void setAnimationStateHandler(@NonNull AnimationStateHandler handler) { - throw new UnsupportedOperationException(); - } - - @Override - public void setGutsShown(@NonNull NotificationEntry entry, boolean gutsShown) { - throw new UnsupportedOperationException(); - } - - @Override - public void setHeadsUpAnimatingAway(boolean headsUpAnimatingAway) { - throw new UnsupportedOperationException(); - } - - @Override - public void setRemoteInputActive(@NonNull NotificationEntry entry, - boolean remoteInputActive) { - throw new UnsupportedOperationException(); - } - - @Override - public void setTrackingHeadsUp(boolean tracking) { - throw new UnsupportedOperationException(); - } - - @Override - public boolean shouldSwallowClick(@NonNull String key) { - throw new UnsupportedOperationException(); - } -} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt index ca0f9ef5f2b0..8bca17f72c9f 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowControllerTest.kt @@ -28,7 +28,7 @@ import com.android.internal.logging.MetricsLogger import com.android.internal.logging.UiEventLogger import com.android.internal.statusbar.IStatusBarService import com.android.systemui.SysuiTestCase -import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.FeatureFlagsClassic import com.android.systemui.log.logcatLogBuffer import com.android.systemui.plugins.FalsingManager import com.android.systemui.plugins.PluginManager @@ -57,9 +57,7 @@ import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.mock import com.android.systemui.util.mockito.withArgCaptor import com.android.systemui.util.time.SystemClock -import com.android.systemui.wmshell.BubblesManager import com.google.android.msdl.domain.MSDLPlayer -import java.util.Optional import junit.framework.Assert import org.junit.After import org.junit.Before @@ -103,9 +101,8 @@ class ExpandableNotificationRowControllerTest : SysuiTestCase() { private val gutsManager: NotificationGutsManager = mock() private val onUserInteractionCallback: OnUserInteractionCallback = mock() private val falsingManager: FalsingManager = mock() - private val featureFlags: FeatureFlags = mock() + private val featureFlags: FeatureFlagsClassic = mock() private val peopleNotificationIdentifier: PeopleNotificationIdentifier = mock() - private val bubblesManager: BubblesManager = mock() private val settingsController: NotificationSettingsController = mock() private val dragController: ExpandableNotificationRowDragController = mock() private val dismissibilityProvider: NotificationDismissibilityProvider = mock() @@ -147,7 +144,6 @@ class ExpandableNotificationRowControllerTest : SysuiTestCase() { falsingManager, featureFlags, peopleNotificationIdentifier, - Optional.of(bubblesManager), settingsController, dragController, dismissibilityProvider, diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java index 080ac3f8c697..b323ef85b370 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationTestHelper.java @@ -25,7 +25,6 @@ import static com.android.systemui.log.LogBufferHelperKt.logcatLogBuffer; import static com.android.systemui.statusbar.NotificationEntryHelper.modifyRanking; import static com.android.systemui.util.Assert.runWithCurrentThreadAsMainThread; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -59,8 +58,8 @@ import com.android.internal.statusbar.IStatusBarService; import com.android.keyguard.TestScopeProvider; import com.android.systemui.TestableDependency; import com.android.systemui.classifier.FalsingManagerFake; -import com.android.systemui.flags.FakeFeatureFlags; -import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.FakeFeatureFlagsClassic; +import com.android.systemui.flags.FeatureFlagsClassic; import com.android.systemui.media.controls.util.MediaFeatureFlag; import com.android.systemui.media.dialog.MediaOutputDialogManager; import com.android.systemui.plugins.statusbar.StatusBarStateController; @@ -71,7 +70,6 @@ import com.android.systemui.statusbar.NotificationShadeWindowController; import com.android.systemui.statusbar.SmartReplyController; import com.android.systemui.statusbar.notification.ColorUpdateLogger; import com.android.systemui.statusbar.notification.ConversationNotificationProcessor; -import com.android.systemui.statusbar.notification.SourceType; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder; import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection; @@ -79,6 +77,7 @@ import com.android.systemui.statusbar.notification.collection.notifcollection.No import com.android.systemui.statusbar.notification.collection.provider.NotificationDismissibilityProvider; import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager; import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager; +import com.android.systemui.statusbar.notification.headsup.HeadsUpManager; import com.android.systemui.statusbar.notification.icon.IconBuilder; import com.android.systemui.statusbar.notification.icon.IconManager; import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier; @@ -89,7 +88,6 @@ import com.android.systemui.statusbar.notification.row.NotificationRowContentBin import com.android.systemui.statusbar.notification.row.shared.NotificationRowContentBinderRefactor; import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainerLogger; import com.android.systemui.statusbar.phone.KeyguardBypassController; -import com.android.systemui.statusbar.notification.headsup.HeadsUpManager; import com.android.systemui.statusbar.policy.InflatedSmartReplyState; import com.android.systemui.statusbar.policy.InflatedSmartReplyViewHolder; import com.android.systemui.statusbar.policy.SmartReplyConstants; @@ -99,7 +97,6 @@ import com.android.systemui.util.concurrency.FakeExecutor; import com.android.systemui.util.time.FakeSystemClock; import com.android.systemui.util.time.SystemClock; import com.android.systemui.util.time.SystemClockImpl; -import com.android.systemui.wmshell.BubblesManager; import com.android.systemui.wmshell.BubblesTestActivity; import kotlin.coroutines.CoroutineContext; @@ -109,7 +106,6 @@ import kotlinx.coroutines.test.TestScope; import org.mockito.ArgumentCaptor; import java.util.Objects; -import java.util.Optional; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; @@ -149,7 +145,7 @@ public class NotificationTestHelper { private final NotificationDismissibilityProvider mDismissibilityProvider; public final Runnable mFutureDismissalRunnable; private @InflationFlag int mDefaultInflationFlags; - private final FakeFeatureFlags mFeatureFlags; + private final FakeFeatureFlagsClassic mFeatureFlags; private final SystemClock mSystemClock; private final RowInflaterTaskLogger mRowInflaterTaskLogger; private final TestScope mTestScope = TestScopeProvider.getTestScope(); @@ -167,17 +163,17 @@ public class NotificationTestHelper { Context context, TestableDependency dependency, @Nullable TestableLooper testLooper) { - this(context, dependency, testLooper, new FakeFeatureFlags()); + this(context, dependency, testLooper, new FakeFeatureFlagsClassic()); } public NotificationTestHelper( Context context, TestableDependency dependency, @Nullable TestableLooper testLooper, - @NonNull FakeFeatureFlags featureFlags) { + @NonNull FakeFeatureFlagsClassic featureFlags) { mContext = context; mFeatureFlags = Objects.requireNonNull(featureFlags); - dependency.injectTestDependency(FeatureFlags.class, mFeatureFlags); + dependency.injectTestDependency(FeatureFlagsClassic.class, mFeatureFlags); dependency.injectMockDependency(NotificationMediaManager.class); dependency.injectMockDependency(NotificationShadeWindowController.class); dependency.injectMockDependency(MediaOutputDialogManager.class); @@ -280,24 +276,6 @@ public class NotificationTestHelper { } /** - * Creates a generic row with rounded border. - * - * @return a generic row with the set roundness. - * @throws Exception - */ - public ExpandableNotificationRow createRowWithRoundness( - float topRoundness, - float bottomRoundness, - SourceType sourceType - ) throws Exception { - ExpandableNotificationRow row = createRow(); - row.requestRoundness(topRoundness, bottomRoundness, sourceType, /*animate = */ false); - assertEquals(topRoundness, row.getTopRoundness(), /* delta = */ 0f); - assertEquals(bottomRoundness, row.getBottomRoundness(), /* delta = */ 0f); - return row; - } - - /** * Creates a generic row. * * @return a generic row with no special properties. @@ -400,9 +378,8 @@ public class NotificationTestHelper { null /* groupKey */, makeBubbleMetadata(null /* deleteIntent */, false /* autoExpand */)); n.flags |= FLAG_FSI_REQUESTED_BUT_DENIED; - ExpandableNotificationRow row = generateRow(n, PKG, UID, USER_HANDLE, + return generateRow(n, PKG, UID, USER_HANDLE, mDefaultInflationFlags, IMPORTANCE_HIGH); - return row; } @@ -668,7 +645,6 @@ public class NotificationTestHelper { mStatusBarStateController, mPeopleNotificationIdentifier, mOnUserInteractionCallback, - Optional.of(mock(BubblesManager.class)), mock(NotificationGutsManager.class), mDismissibilityProvider, mock(MetricsLogger.class), @@ -676,7 +652,6 @@ public class NotificationTestHelper { mock(ColorUpdateLogger.class), mock(SmartReplyConstants.class), mock(SmartReplyController.class), - mFeatureFlags, mock(IStatusBarService.class), mock(UiEventLogger.class)); diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationTargetsHelperTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationTargetsHelperTest.kt index 660eb308fdf3..87833d0c03f6 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationTargetsHelperTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/NotificationTargetsHelperTest.kt @@ -5,7 +5,7 @@ import android.testing.TestableLooper.RunWithLooper import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.flags.FakeFeatureFlags +import com.android.systemui.flags.FakeFeatureFlagsClassic import com.android.systemui.statusbar.notification.row.NotificationTestHelper import com.android.systemui.util.mockito.mock import junit.framework.Assert.assertEquals @@ -18,7 +18,7 @@ import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) @RunWithLooper class NotificationTargetsHelperTest : SysuiTestCase() { - private val featureFlags = FakeFeatureFlags() + private val featureFlags = FakeFeatureFlagsClassic() lateinit var notificationTestHelper: NotificationTestHelper private val sectionsManager: NotificationSectionsManager = mock() private val stackScrollLayout: NotificationStackScrollLayout = mock() @@ -90,11 +90,7 @@ class NotificationTargetsHelperTest : SysuiTestCase() { ) val expected = - RoundableTargets( - before = children.attachedChildren[1], - swiped = swiped, - after = null, - ) + RoundableTargets(before = children.attachedChildren[1], swiped = swiped, after = null) assertEquals(expected, actual) } } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java deleted file mode 100644 index 3bd12e6efab6..000000000000 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.java +++ /dev/null @@ -1,310 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.systemui.statusbar.phone; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.isNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.platform.test.annotations.DisableFlags; -import android.testing.TestableLooper; -import android.testing.TestableLooper.RunWithLooper; -import android.view.View; -import android.widget.TextView; - -import androidx.test.ext.junit.runners.AndroidJUnit4; -import androidx.test.filters.SmallTest; - -import com.android.systemui.SysuiTestCase; -import com.android.systemui.plugins.DarkIconDispatcher; -import com.android.systemui.plugins.statusbar.StatusBarStateController; -import com.android.systemui.shade.ShadeHeadsUpTracker; -import com.android.systemui.shade.ShadeViewController; -import com.android.systemui.statusbar.CommandQueue; -import com.android.systemui.statusbar.HeadsUpStatusBarView; -import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator; -import com.android.systemui.statusbar.notification.collection.NotificationEntry; -import com.android.systemui.statusbar.notification.domain.interactor.HeadsUpNotificationIconInteractor; -import com.android.systemui.statusbar.notification.headsup.PinnedStatus; -import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; -import com.android.systemui.statusbar.notification.row.NotificationTestHelper; -import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation; -import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager; -import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController; -import com.android.systemui.statusbar.policy.Clock; -import com.android.systemui.statusbar.notification.headsup.HeadsUpManager; -import com.android.systemui.statusbar.policy.KeyguardStateController; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.util.Optional; - -@SmallTest -@RunWith(AndroidJUnit4.class) -@RunWithLooper -public class HeadsUpAppearanceControllerTest extends SysuiTestCase { - - private final NotificationStackScrollLayoutController mStackScrollerController = - mock(NotificationStackScrollLayoutController.class); - private final ShadeViewController mShadeViewController = - mock(ShadeViewController.class); - private final ShadeHeadsUpTracker mShadeHeadsUpTracker = mock(ShadeHeadsUpTracker.class); - private final DarkIconDispatcher mDarkIconDispatcher = mock(DarkIconDispatcher.class); - private HeadsUpAppearanceController mHeadsUpAppearanceController; - private NotificationTestHelper mTestHelper; - private ExpandableNotificationRow mRow; - private NotificationEntry mEntry; - private HeadsUpStatusBarView mHeadsUpStatusBarView; - private HeadsUpManager mHeadsUpManager; - private View mOperatorNameView; - private StatusBarStateController mStatusbarStateController; - private PhoneStatusBarTransitions mPhoneStatusBarTransitions; - private KeyguardBypassController mBypassController; - private NotificationWakeUpCoordinator mWakeUpCoordinator; - private KeyguardStateController mKeyguardStateController; - private CommandQueue mCommandQueue; - private NotificationRoundnessManager mNotificationRoundnessManager; - - @Before - public void setUp() throws Exception { - allowTestableLooperAsMainThread(); - mTestHelper = new NotificationTestHelper( - mContext, - mDependency, - TestableLooper.get(this)); - mRow = mTestHelper.createRow(); - mEntry = mRow.getEntry(); - mHeadsUpStatusBarView = new HeadsUpStatusBarView(mContext, mock(View.class), - mock(TextView.class)); - mHeadsUpManager = mock(HeadsUpManager.class); - mOperatorNameView = new View(mContext); - mStatusbarStateController = mock(StatusBarStateController.class); - mPhoneStatusBarTransitions = mock(PhoneStatusBarTransitions.class); - mBypassController = mock(KeyguardBypassController.class); - mWakeUpCoordinator = mock(NotificationWakeUpCoordinator.class); - mKeyguardStateController = mock(KeyguardStateController.class); - mCommandQueue = mock(CommandQueue.class); - mNotificationRoundnessManager = mock(NotificationRoundnessManager.class); - when(mShadeViewController.getShadeHeadsUpTracker()).thenReturn(mShadeHeadsUpTracker); - mHeadsUpAppearanceController = new HeadsUpAppearanceController( - mHeadsUpManager, - mStatusbarStateController, - mPhoneStatusBarTransitions, - mBypassController, - mWakeUpCoordinator, - mDarkIconDispatcher, - mKeyguardStateController, - mCommandQueue, - mStackScrollerController, - mShadeViewController, - mNotificationRoundnessManager, - mHeadsUpStatusBarView, - new Clock(mContext, null), - mock(HeadsUpNotificationIconInteractor.class), - Optional.of(mOperatorNameView)); - mHeadsUpAppearanceController.setAppearFraction(0.0f, 0.0f); - } - - @Test - public void testShowinEntryUpdated() { - mRow.setPinnedStatus(PinnedStatus.PinnedBySystem); - when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(true); - when(mHeadsUpManager.getTopEntry()).thenReturn(mEntry); - mHeadsUpAppearanceController.onHeadsUpPinned(mEntry); - assertEquals(mRow.getEntry(), mHeadsUpStatusBarView.getShowingEntry()); - - mRow.setPinnedStatus(PinnedStatus.NotPinned); - when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(false); - mHeadsUpAppearanceController.onHeadsUpUnPinned(mEntry); - assertNull(mHeadsUpStatusBarView.getShowingEntry()); - } - - @Test - public void testPinnedStatusUpdated() { - mRow.setPinnedStatus(PinnedStatus.PinnedBySystem); - when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(true); - when(mHeadsUpManager.getTopEntry()).thenReturn(mEntry); - mHeadsUpAppearanceController.onHeadsUpPinned(mEntry); - assertEquals(PinnedStatus.PinnedBySystem, mHeadsUpAppearanceController.getPinnedStatus()); - - mRow.setPinnedStatus(PinnedStatus.NotPinned); - when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(false); - mHeadsUpAppearanceController.onHeadsUpUnPinned(mEntry); - assertEquals(PinnedStatus.NotPinned, mHeadsUpAppearanceController.getPinnedStatus()); - } - - @Test - @DisableFlags(AsyncGroupHeaderViewInflation.FLAG_NAME) - public void testHeaderUpdated() { - mRow.setPinnedStatus(PinnedStatus.PinnedBySystem); - when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(true); - when(mHeadsUpManager.getTopEntry()).thenReturn(mEntry); - mHeadsUpAppearanceController.onHeadsUpPinned(mEntry); - assertEquals(mRow.getHeaderVisibleAmount(), 0.0f, 0.0f); - - mRow.setPinnedStatus(PinnedStatus.NotPinned); - when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(false); - mHeadsUpAppearanceController.onHeadsUpUnPinned(mEntry); - assertEquals(mRow.getHeaderVisibleAmount(), 1.0f, 0.0f); - } - - @Test - public void testOperatorNameViewUpdated() { - mHeadsUpAppearanceController.setAnimationsEnabled(false); - - mRow.setPinnedStatus(PinnedStatus.PinnedBySystem); - when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(true); - when(mHeadsUpManager.getTopEntry()).thenReturn(mEntry); - mHeadsUpAppearanceController.onHeadsUpPinned(mEntry); - assertEquals(View.INVISIBLE, mOperatorNameView.getVisibility()); - - mRow.setPinnedStatus(PinnedStatus.NotPinned); - when(mHeadsUpManager.hasPinnedHeadsUp()).thenReturn(false); - mHeadsUpAppearanceController.onHeadsUpUnPinned(mEntry); - assertEquals(View.VISIBLE, mOperatorNameView.getVisibility()); - } - - @Test - public void constructor_animationValuesUpdated() { - float appearFraction = .75f; - float expandedHeight = 400f; - when(mStackScrollerController.getAppearFraction()).thenReturn(appearFraction); - when(mStackScrollerController.getExpandedHeight()).thenReturn(expandedHeight); - - HeadsUpAppearanceController newController = new HeadsUpAppearanceController( - mHeadsUpManager, - mStatusbarStateController, - mPhoneStatusBarTransitions, - mBypassController, - mWakeUpCoordinator, - mDarkIconDispatcher, - mKeyguardStateController, - mCommandQueue, - mStackScrollerController, - mShadeViewController, - mNotificationRoundnessManager, - mHeadsUpStatusBarView, - new Clock(mContext, null), - mock(HeadsUpNotificationIconInteractor.class), - Optional.empty()); - - assertEquals(expandedHeight, newController.mExpandedHeight, 0.0f); - assertEquals(appearFraction, newController.mAppearFraction, 0.0f); - } - - @Test - public void testDestroy() { - reset(mHeadsUpManager); - reset(mDarkIconDispatcher); - reset(mShadeHeadsUpTracker); - reset(mStackScrollerController); - - mHeadsUpAppearanceController.onViewDetached(); - - verify(mHeadsUpManager).removeListener(any()); - verify(mDarkIconDispatcher).removeDarkReceiver(any()); - verify(mShadeHeadsUpTracker).removeTrackingHeadsUpListener(any()); - verify(mShadeHeadsUpTracker).setHeadsUpAppearanceController(isNull()); - verify(mStackScrollerController).removeOnExpandedHeightChangedListener(any()); - } - - @Test - public void testPulsingRoundness_onUpdateHeadsUpAndPulsingRoundness() { - // Pulsing: Enable flag and dozing - when(mNotificationRoundnessManager.shouldRoundNotificationPulsing()).thenReturn(true); - when(mTestHelper.getStatusBarStateController().isDozing()).thenReturn(true); - - // Pulsing: Enabled - mRow.setHeadsUp(true); - mHeadsUpAppearanceController.updateHeadsUpAndPulsingRoundness(mEntry); - - String debugString = mRow.getRoundableState().debugString(); - assertEquals( - "If Pulsing is enabled, roundness should be set to 1. Value: " + debugString, - /* expected = */ 1, - /* actual = */ mRow.getTopRoundness(), - /* delta = */ 0.001 - ); - assertTrue(debugString.contains("Pulsing")); - - // Pulsing: Disabled - mRow.setHeadsUp(false); - mHeadsUpAppearanceController.updateHeadsUpAndPulsingRoundness(mEntry); - - assertEquals( - "If Pulsing is disabled, roundness should be set to 0. Value: " - + mRow.getRoundableState().debugString(), - /* expected = */ 0, - /* actual = */ mRow.getTopRoundness(), - /* delta = */ 0.001 - ); - } - - @Test - public void testPulsingRoundness_onHeadsUpStateChanged() { - // Pulsing: Enable flag and dozing - when(mNotificationRoundnessManager.shouldRoundNotificationPulsing()).thenReturn(true); - when(mTestHelper.getStatusBarStateController().isDozing()).thenReturn(true); - - // Pulsing: Enabled - mEntry.setHeadsUp(true); - mHeadsUpAppearanceController.onHeadsUpStateChanged(mEntry, true); - - String debugString = mRow.getRoundableState().debugString(); - assertEquals( - "If Pulsing is enabled, roundness should be set to 1. Value: " + debugString, - /* expected = */ 1, - /* actual = */ mRow.getTopRoundness(), - /* delta = */ 0.001 - ); - assertTrue(debugString.contains("Pulsing")); - - // Pulsing: Disabled - mEntry.setHeadsUp(false); - mHeadsUpAppearanceController.onHeadsUpStateChanged(mEntry, false); - - assertEquals( - "If Pulsing is disabled, roundness should be set to 0. Value: " - + mRow.getRoundableState().debugString(), - /* expected = */ 0, - /* actual = */ mRow.getTopRoundness(), - /* delta = */ 0.001 - ); - } - - @Test - public void onHeadsUpStateChanged_true_transitionsNotified() { - mHeadsUpAppearanceController.onHeadsUpStateChanged(mEntry, true); - - verify(mPhoneStatusBarTransitions).onHeadsUpStateChanged(true); - } - - @Test - public void onHeadsUpStateChanged_false_transitionsNotified() { - mHeadsUpAppearanceController.onHeadsUpStateChanged(mEntry, false); - - verify(mPhoneStatusBarTransitions).onHeadsUpStateChanged(false); - } -} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.kt new file mode 100644 index 000000000000..a9afb0658c50 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/HeadsUpAppearanceControllerTest.kt @@ -0,0 +1,279 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ +package com.android.systemui.statusbar.phone + +import android.platform.test.annotations.DisableFlags +import android.testing.TestableLooper +import android.testing.TestableLooper.RunWithLooper +import android.view.View +import android.widget.TextView +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.plugins.fakeDarkIconDispatcher +import com.android.systemui.plugins.statusbar.statusBarStateController +import com.android.systemui.shade.ShadeHeadsUpTracker +import com.android.systemui.shade.shadeViewController +import com.android.systemui.statusbar.HeadsUpStatusBarView +import com.android.systemui.statusbar.commandQueue +import com.android.systemui.statusbar.notification.collection.NotificationEntry +import com.android.systemui.statusbar.notification.domain.interactor.HeadsUpNotificationIconInteractor +import com.android.systemui.statusbar.notification.domain.interactor.headsUpNotificationIconInteractor +import com.android.systemui.statusbar.notification.headsup.PinnedStatus +import com.android.systemui.statusbar.notification.headsup.headsUpManager +import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow +import com.android.systemui.statusbar.notification.row.NotificationTestHelper +import com.android.systemui.statusbar.notification.row.shared.AsyncGroupHeaderViewInflation +import com.android.systemui.statusbar.notification.stack.NotificationRoundnessManager +import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController +import com.android.systemui.statusbar.policy.Clock +import com.android.systemui.statusbar.policy.keyguardStateController +import com.android.systemui.testKosmos +import com.google.common.truth.Truth.assertThat +import java.util.Optional +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.any +import org.mockito.kotlin.mock +import org.mockito.kotlin.reset +import org.mockito.kotlin.verify +import org.mockito.kotlin.whenever + +@SmallTest +@RunWith(AndroidJUnit4::class) +@RunWithLooper +class HeadsUpAppearanceControllerTest : SysuiTestCase() { + private val kosmos = testKosmos().useUnconfinedTestDispatcher() + + private val stackScrollerController = mock<NotificationStackScrollLayoutController>() + private val shadeViewController = kosmos.shadeViewController + private val shadeHeadsUpTracker = mock<ShadeHeadsUpTracker>() + private val darkIconDispatcher = kosmos.fakeDarkIconDispatcher + private val statusBarStateController = kosmos.statusBarStateController + private val phoneStatusBarTransitions = kosmos.mockPhoneStatusBarTransitions + private val bypassController = kosmos.keyguardBypassController + private val wakeUpCoordinator = kosmos.notificationWakeUpCoordinator + private val keyguardStateController = kosmos.keyguardStateController + private val commandQueue = kosmos.commandQueue + private val notificationRoundnessManager = mock<NotificationRoundnessManager>() + private var headsUpManager = kosmos.headsUpManager + + private lateinit var testHelper: NotificationTestHelper + private lateinit var row: ExpandableNotificationRow + private lateinit var entry: NotificationEntry + private lateinit var headsUpStatusBarView: HeadsUpStatusBarView + private lateinit var operatorNameView: View + + private lateinit var underTest: HeadsUpAppearanceController + + @Before + @Throws(Exception::class) + fun setUp() { + allowTestableLooperAsMainThread() + testHelper = NotificationTestHelper(mContext, mDependency, TestableLooper.get(this)) + row = testHelper.createRow() + entry = row.entry + headsUpStatusBarView = HeadsUpStatusBarView(mContext, mock<View>(), mock<TextView>()) + operatorNameView = View(mContext) + + whenever(shadeViewController.shadeHeadsUpTracker).thenReturn(shadeHeadsUpTracker) + underTest = + HeadsUpAppearanceController( + headsUpManager, + statusBarStateController, + phoneStatusBarTransitions, + bypassController, + wakeUpCoordinator, + darkIconDispatcher, + keyguardStateController, + commandQueue, + stackScrollerController, + shadeViewController, + notificationRoundnessManager, + headsUpStatusBarView, + Clock(mContext, null), + kosmos.headsUpNotificationIconInteractor, + Optional.of(operatorNameView), + ) + underTest.setAppearFraction(0.0f, 0.0f) + } + + @Test + fun testShowinEntryUpdated() { + row.setPinnedStatus(PinnedStatus.PinnedBySystem) + whenever(headsUpManager.hasPinnedHeadsUp()).thenReturn(true) + whenever(headsUpManager.getTopEntry()).thenReturn(entry) + underTest.onHeadsUpPinned(entry) + assertThat(headsUpStatusBarView.showingEntry).isEqualTo(row.entry) + + row.setPinnedStatus(PinnedStatus.NotPinned) + whenever(headsUpManager.hasPinnedHeadsUp()).thenReturn(false) + underTest.onHeadsUpUnPinned(entry) + assertThat(headsUpStatusBarView.showingEntry).isNull() + } + + @Test + fun testPinnedStatusUpdated() { + row.setPinnedStatus(PinnedStatus.PinnedBySystem) + whenever(headsUpManager.hasPinnedHeadsUp()).thenReturn(true) + whenever(headsUpManager.getTopEntry()).thenReturn(entry) + underTest.onHeadsUpPinned(entry) + assertThat(underTest.pinnedStatus).isEqualTo(PinnedStatus.PinnedBySystem) + + row.setPinnedStatus(PinnedStatus.NotPinned) + whenever(headsUpManager.hasPinnedHeadsUp()).thenReturn(false) + underTest.onHeadsUpUnPinned(entry) + assertThat(underTest.pinnedStatus).isEqualTo(PinnedStatus.NotPinned) + } + + @Test + @DisableFlags(AsyncGroupHeaderViewInflation.FLAG_NAME) + fun testHeaderUpdated() { + row.setPinnedStatus(PinnedStatus.PinnedBySystem) + whenever(headsUpManager.hasPinnedHeadsUp()).thenReturn(true) + whenever(headsUpManager.getTopEntry()).thenReturn(entry) + underTest.onHeadsUpPinned(entry) + assertThat(row.headerVisibleAmount).isEqualTo(0.0f) + + row.setPinnedStatus(PinnedStatus.NotPinned) + whenever(headsUpManager.hasPinnedHeadsUp()).thenReturn(false) + underTest.onHeadsUpUnPinned(entry) + assertThat(row.headerVisibleAmount).isEqualTo(1.0f) + } + + @Test + fun testOperatorNameViewUpdated() { + underTest.setAnimationsEnabled(false) + + row.setPinnedStatus(PinnedStatus.PinnedBySystem) + whenever(headsUpManager.hasPinnedHeadsUp()).thenReturn(true) + whenever(headsUpManager.getTopEntry()).thenReturn(entry) + underTest.onHeadsUpPinned(entry) + assertThat(operatorNameView.visibility).isEqualTo(View.INVISIBLE) + + row.setPinnedStatus(PinnedStatus.NotPinned) + whenever(headsUpManager.hasPinnedHeadsUp()).thenReturn(false) + underTest.onHeadsUpUnPinned(entry) + assertThat(operatorNameView.visibility).isEqualTo(View.VISIBLE) + } + + @Test + fun constructor_animationValuesUpdated() { + val appearFraction = .75f + val expandedHeight = 400f + whenever(stackScrollerController.appearFraction).thenReturn(appearFraction) + whenever(stackScrollerController.expandedHeight).thenReturn(expandedHeight) + + val newController = + HeadsUpAppearanceController( + headsUpManager, + statusBarStateController, + phoneStatusBarTransitions, + bypassController, + wakeUpCoordinator, + darkIconDispatcher, + keyguardStateController, + commandQueue, + stackScrollerController, + shadeViewController, + notificationRoundnessManager, + headsUpStatusBarView, + Clock(mContext, null), + mock<HeadsUpNotificationIconInteractor>(), + Optional.empty(), + ) + + assertThat(newController.mExpandedHeight).isEqualTo(expandedHeight) + assertThat(newController.mAppearFraction).isEqualTo(appearFraction) + } + + @Test + fun testDestroy() { + reset(headsUpManager) + reset(shadeHeadsUpTracker) + reset(stackScrollerController) + + underTest.onViewDetached() + + verify(headsUpManager).removeListener(any()) + assertThat(darkIconDispatcher.receivers).isEmpty() + verify(shadeHeadsUpTracker).removeTrackingHeadsUpListener(any()) + verify(shadeHeadsUpTracker).setHeadsUpAppearanceController(null) + verify(stackScrollerController).removeOnExpandedHeightChangedListener(any()) + } + + @Test + fun testPulsingRoundness_onUpdateHeadsUpAndPulsingRoundness() { + // Pulsing: Enable flag and dozing + whenever(notificationRoundnessManager.shouldRoundNotificationPulsing()).thenReturn(true) + whenever(testHelper.statusBarStateController.isDozing).thenReturn(true) + + // Pulsing: Enabled + row.isHeadsUp = true + underTest.updateHeadsUpAndPulsingRoundness(entry) + + val debugString: String = row.roundableState.debugString() + // If Pulsing is enabled, roundness should be set to 1 + assertThat(row.topRoundness.toDouble()).isWithin(0.001).of(1.0) + assertThat(debugString).contains("Pulsing") + + // Pulsing: Disabled + row.isHeadsUp = false + underTest.updateHeadsUpAndPulsingRoundness(entry) + + // If Pulsing is disabled, roundness should be set to 0 + assertThat(row.topRoundness.toDouble()).isWithin(0.001).of(0.0) + } + + @Test + fun testPulsingRoundness_onHeadsUpStateChanged() { + // Pulsing: Enable flag and dozing + whenever(notificationRoundnessManager.shouldRoundNotificationPulsing()).thenReturn(true) + whenever(testHelper.statusBarStateController.isDozing).thenReturn(true) + + // Pulsing: Enabled + entry.setHeadsUp(true) + underTest.onHeadsUpStateChanged(entry, true) + + val debugString: String = row.roundableState.debugString() + // If Pulsing is enabled, roundness should be set to 1 + assertThat(row.topRoundness.toDouble()).isWithin(0.001).of(1.0) + assertThat(debugString).contains("Pulsing") + + // Pulsing: Disabled + entry.setHeadsUp(false) + underTest.onHeadsUpStateChanged(entry, false) + + // If Pulsing is disabled, roundness should be set to 0 + assertThat(row.topRoundness.toDouble()).isWithin(0.001).of(0.0) + } + + @Test + fun onHeadsUpStateChanged_true_transitionsNotified() { + underTest.onHeadsUpStateChanged(entry, true) + + verify(phoneStatusBarTransitions).onHeadsUpStateChanged(true) + } + + @Test + fun onHeadsUpStateChanged_false_transitionsNotified() { + underTest.onHeadsUpStateChanged(entry, false) + + verify(phoneStatusBarTransitions).onHeadsUpStateChanged(false) + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaListenerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaListenerTest.kt index 110dec6c33aa..f76ee5e3ebc9 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaListenerTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaListenerTest.kt @@ -87,7 +87,7 @@ private const val PROC_STATE_INVISIBLE = ActivityManager.PROCESS_STATE_FOREGROUN @RunWith(AndroidJUnit4::class) @TestableLooper.RunWithLooper @OptIn(ExperimentalCoroutinesApi::class) -@DisableFlags(FLAG_STATUS_BAR_USE_REPOS_FOR_CALL_CHIP) +@DisableFlags(FLAG_STATUS_BAR_USE_REPOS_FOR_CALL_CHIP, StatusBarChipsModernization.FLAG_NAME) class OngoingCallControllerViaListenerTest : SysuiTestCase() { private val kosmos = Kosmos() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaRepoTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaRepoTest.kt index 2ad50cc38b7c..647b5f86fcee 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaRepoTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallControllerViaRepoTest.kt @@ -29,6 +29,7 @@ import android.widget.LinearLayout import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.Flags.FLAG_STATUS_BAR_CALL_CHIP_NOTIFICATION_ICON +import com.android.systemui.Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION import com.android.systemui.Flags.FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS import com.android.systemui.Flags.FLAG_STATUS_BAR_USE_REPOS_FOR_CALL_CHIP import com.android.systemui.SysuiTestCase @@ -77,6 +78,7 @@ import org.mockito.kotlin.whenever @TestableLooper.RunWithLooper @OptIn(ExperimentalCoroutinesApi::class) @EnableFlags(FLAG_STATUS_BAR_USE_REPOS_FOR_CALL_CHIP) +@DisableFlags(StatusBarChipsModernization.FLAG_NAME) class OngoingCallControllerViaRepoTest : SysuiTestCase() { private val kosmos = Kosmos() diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepositoryTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepositoryTest.kt index 4c6eaa589e6a..a44631348796 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepositoryTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepositoryTest.kt @@ -16,10 +16,13 @@ package com.android.systemui.statusbar.phone.ongoingcall.data.repository +import android.platform.test.annotations.DisableFlags import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest +import com.android.systemui.Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION import com.android.systemui.SysuiTestCase import com.android.systemui.kosmos.Kosmos +import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel import com.android.systemui.statusbar.phone.ongoingcall.shared.model.inCallModel import com.google.common.truth.Truth.assertThat @@ -28,6 +31,7 @@ import org.junit.runner.RunWith @SmallTest @RunWith(AndroidJUnit4::class) +@DisableFlags(StatusBarChipsModernization.FLAG_NAME) class OngoingCallRepositoryTest : SysuiTestCase() { private val kosmos = Kosmos() private val underTest = kosmos.ongoingCallRepository diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractorTest.kt new file mode 100644 index 000000000000..ca1413e48966 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractorTest.kt @@ -0,0 +1,208 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@file:OptIn(ExperimentalCoroutinesApi::class) + +package com.android.systemui.statusbar.phone.ongoingcall.domain.interactor + +import android.app.PendingIntent +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.activity.data.repository.activityManagerRepository +import com.android.systemui.activity.data.repository.fake +import com.android.systemui.coroutines.collectLastValue +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.collectLastValue +import com.android.systemui.kosmos.runTest +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.statusbar.StatusBarIconView +import com.android.systemui.statusbar.notification.data.model.activeNotificationModel +import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore +import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository +import com.android.systemui.statusbar.notification.shared.CallType +import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel +import com.google.common.truth.Truth.assertThat +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runTest +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.kotlin.mock + +@SmallTest +@RunWith(AndroidJUnit4::class) +class OngoingCallInteractorTest : SysuiTestCase() { + private val kosmos = Kosmos().useUnconfinedTestDispatcher() + private val repository = kosmos.activeNotificationListRepository + private val underTest = kosmos.ongoingCallInteractor + + @Test + fun noNotification_emitsNoCall() = runTest { + val state by collectLastValue(underTest.ongoingCallState) + assertThat(state).isInstanceOf(OngoingCallModel.NoCall::class.java) + } + + @Test + fun ongoingCallNotification_setsNotificationIconAndIntent() = + kosmos.runTest { + val latest by collectLastValue(underTest.ongoingCallState) + + // Set up notification with icon view and intent + val testIconView: StatusBarIconView = mock() + val testIntent: PendingIntent = mock() + repository.activeNotifications.value = + ActiveNotificationsStore.Builder() + .apply { + addIndividualNotif( + activeNotificationModel( + key = "notif1", + whenTime = 1000L, + callType = CallType.Ongoing, + statusBarChipIcon = testIconView, + contentIntent = testIntent + ) + ) + } + .build() + + // Verify model is InCall and has the correct icon and intent. + assertThat(latest).isInstanceOf(OngoingCallModel.InCall::class.java) + val model = latest as OngoingCallModel.InCall + assertThat(model.notificationIconView).isSameInstanceAs(testIconView) + assertThat(model.intent).isSameInstanceAs(testIntent) + } + + @Test + fun ongoingCallNotification_emitsInCall() = + kosmos.runTest { + val latest by collectLastValue(underTest.ongoingCallState) + + repository.activeNotifications.value = + ActiveNotificationsStore.Builder() + .apply { + addIndividualNotif( + activeNotificationModel( + key = "notif1", whenTime = 1000L, callType = CallType.Ongoing + ) + ) + } + .build() + + assertThat(latest).isInstanceOf(OngoingCallModel.InCall::class.java) + } + + @Test + fun notificationRemoved_emitsNoCall() = + kosmos.runTest { + val latest by collectLastValue(underTest.ongoingCallState) + + repository.activeNotifications.value = + ActiveNotificationsStore.Builder() + .apply { + addIndividualNotif( + activeNotificationModel( + key = "notif1", whenTime = 1000L, callType = CallType.Ongoing + ) + ) + } + .build() + + repository.activeNotifications.value = ActiveNotificationsStore() + assertThat(latest).isInstanceOf(OngoingCallModel.NoCall::class.java) + } + + @Test + fun ongoingCallNotification_appVisibleInitially_emitsInCallWithVisibleApp() = + kosmos.runTest { + kosmos.activityManagerRepository.fake.startingIsAppVisibleValue = true + val latest by collectLastValue(underTest.ongoingCallState) + + repository.activeNotifications.value = + ActiveNotificationsStore.Builder() + .apply { + addIndividualNotif( + activeNotificationModel( + key = "notif1", + whenTime = 1000L, + callType = CallType.Ongoing, + uid = UID + ) + ) + } + .build() + + assertThat(latest).isInstanceOf(OngoingCallModel.InCallWithVisibleApp::class.java) + } + + @Test + fun ongoingCallNotification_appNotVisibleInitially_emitsInCall() = + kosmos.runTest { + kosmos.activityManagerRepository.fake.startingIsAppVisibleValue = false + val latest by collectLastValue(underTest.ongoingCallState) + + repository.activeNotifications.value = + ActiveNotificationsStore.Builder() + .apply { + addIndividualNotif( + activeNotificationModel( + key = "notif1", + whenTime = 1000L, + callType = CallType.Ongoing, + uid = UID + ) + ) + } + .build() + + assertThat(latest).isInstanceOf(OngoingCallModel.InCall::class.java) + } + + @Test + fun ongoingCallNotification_visibilityChanges_updatesState() = + kosmos.runTest { + val latest by collectLastValue(underTest.ongoingCallState) + + // Start with notification and app not visible + kosmos.activityManagerRepository.fake.startingIsAppVisibleValue = false + repository.activeNotifications.value = + ActiveNotificationsStore.Builder() + .apply { + addIndividualNotif( + activeNotificationModel( + key = "notif1", + whenTime = 1000L, + callType = CallType.Ongoing, + uid = UID + ) + ) + } + .build() + assertThat(latest) + .isInstanceOf(OngoingCallModel.InCall::class.java) + + // App becomes visible + kosmos.activityManagerRepository.fake.setIsAppVisible(UID, true) + assertThat(latest).isInstanceOf(OngoingCallModel.InCallWithVisibleApp::class.java) + + // App becomes invisible again + kosmos.activityManagerRepository.fake.setIsAppVisible(UID, false) + assertThat(latest).isInstanceOf(OngoingCallModel.InCall::class.java) + } + + companion object { + private const val UID = 885 + } +} diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java index e7ca1dd3e4b7..7b52dd836b51 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/theme/ThemeOverlayControllerTest.java @@ -434,13 +434,13 @@ public class ThemeOverlayControllerTest extends SysuiTestCase { @Test public void onSettingChanged_honorThemeStyle() { when(mDeviceProvisionedController.isUserSetup(anyInt())).thenReturn(true); - List<Style> validStyles = Arrays.asList(Style.EXPRESSIVE, Style.SPRITZ, Style.TONAL_SPOT, - Style.FRUIT_SALAD, Style.RAINBOW, Style.VIBRANT); - for (Style style : validStyles) { + @Style.Type List<Integer> validStyles = Arrays.asList(Style.EXPRESSIVE, Style.SPRITZ, + Style.TONAL_SPOT, Style.FRUIT_SALAD, Style.RAINBOW, Style.VIBRANT); + for (@Style.Type int style : validStyles) { reset(mSecureSettings); String jsonString = "{\"android.theme.customization.system_palette\":\"A16B00\"," - + "\"android.theme.customization.theme_style\":\"" + style.name() + "\"}"; + + "\"android.theme.customization.theme_style\":\"" + Style.name(style) + "\"}"; when(mSecureSettings.getStringForUser( eq(Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES), anyInt())) diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractorTest.kt new file mode 100644 index 000000000000..8acf53869774 --- /dev/null +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractorTest.kt @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.volume.dialog.domain.interactor + +import android.app.ActivityManager +import android.media.AudioManager +import android.testing.TestableLooper +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.filters.SmallTest +import com.android.systemui.SysuiTestCase +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.collectLastValue +import com.android.systemui.kosmos.runTest +import com.android.systemui.kosmos.useUnconfinedTestDispatcher +import com.android.systemui.plugins.fakeVolumeDialogController +import com.android.systemui.testKosmos +import com.android.systemui.volume.Events +import com.android.systemui.volume.dialog.data.repository.volumeDialogVisibilityRepository +import com.android.systemui.volume.dialog.shared.model.VolumeDialogVisibilityModel +import com.google.common.truth.Truth.assertThat +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith + +@SmallTest +@RunWith(AndroidJUnit4::class) +@TestableLooper.RunWithLooper +class VolumeDialogSafetyWarningInteractorTest : SysuiTestCase() { + + private val kosmos: Kosmos = testKosmos() + + private lateinit var underTest: VolumeDialogSafetyWarningInteractor + + @Before + fun setup() { + kosmos.useUnconfinedTestDispatcher() + underTest = kosmos.volumeDialogSafetyWarningInteractor + } + + @Test + fun dismiss_isShowingSafetyWarning_isFalse() = + with(kosmos) { + runTest { + val isShowingSafetyWarning by collectLastValue(underTest.isShowingSafetyWarning) + + underTest.onSafetyWarningDismissed() + + assertThat(isShowingSafetyWarning).isFalse() + } + } + + @Test + fun flagShowUi_isShowingSafetyWarning_isTrue() = + with(kosmos) { + runTest { + val isShowingSafetyWarning by collectLastValue(underTest.isShowingSafetyWarning) + + fakeVolumeDialogController.onShowSafetyWarning(AudioManager.FLAG_SHOW_UI) + + assertThat(isShowingSafetyWarning).isTrue() + } + } + + @Test + fun flagShowUiWarnings_isShowingSafetyWarning_isTrue() = + with(kosmos) { + runTest { + val isShowingSafetyWarning by collectLastValue(underTest.isShowingSafetyWarning) + + fakeVolumeDialogController.onShowSafetyWarning(AudioManager.FLAG_SHOW_UI_WARNINGS) + + assertThat(isShowingSafetyWarning).isTrue() + } + } + + @Test + fun invisibleAndNoFlags_isShowingSafetyWarning_isFalse() = + with(kosmos) { + runTest { + val isShowingSafetyWarning by collectLastValue(underTest.isShowingSafetyWarning) + volumeDialogVisibilityRepository.updateVisibility { + VolumeDialogVisibilityModel.Invisible + } + + fakeVolumeDialogController.onShowSafetyWarning(0) + + assertThat(isShowingSafetyWarning).isFalse() + } + } + + @Test + fun visibleAndNoFlags_isShowingSafetyWarning_isTrue() = + with(kosmos) { + runTest { + val isShowingSafetyWarning by collectLastValue(underTest.isShowingSafetyWarning) + volumeDialogVisibilityRepository.updateVisibility { + VolumeDialogVisibilityModel.Visible( + Events.SHOW_REASON_VOLUME_CHANGED, + false, + ActivityManager.LOCK_TASK_MODE_LOCKED, + ) + } + + fakeVolumeDialogController.onShowSafetyWarning(0) + + assertThat(isShowingSafetyWarning).isTrue() + } + } +} diff --git a/packages/SystemUI/res/layout/screen_record_options.xml b/packages/SystemUI/res/layout/screen_record_options.xml index 4b5cdb5e708d..c6a9470a94b2 100644 --- a/packages/SystemUI/res/layout/screen_record_options.xml +++ b/packages/SystemUI/res/layout/screen_record_options.xml @@ -29,7 +29,7 @@ android:tint="?android:attr/textColorSecondary" android:layout_gravity="center_vertical" android:layout_weight="0" - android:layout_marginRight="@dimen/screenrecord_option_padding" + android:layout_marginEnd="@dimen/screenrecord_option_padding" android:importantForAccessibility="no"/> <Spinner android:id="@+id/screen_recording_options" @@ -63,7 +63,7 @@ android:layout_height="@dimen/screenrecord_option_icon_size" android:src="@drawable/ic_touch" android:tint="?android:attr/textColorSecondary" - android:layout_marginRight="@dimen/screenrecord_option_padding" + android:layout_marginEnd="@dimen/screenrecord_option_padding" android:importantForAccessibility="no"/> <TextView android:layout_width="0dp" diff --git a/packages/SystemUI/res/raw/trackpad_recent_apps_edu.json b/packages/SystemUI/res/raw/trackpad_recent_apps_edu.json index 10768fccd4ad..28662669ec25 100644 --- a/packages/SystemUI/res/raw/trackpad_recent_apps_edu.json +++ b/packages/SystemUI/res/raw/trackpad_recent_apps_edu.json @@ -1 +1 @@ -{"v":"5.12.1","fr":60,"ip":0,"op":511,"w":554,"h":564,"nm":"Trackpad-JSON_Recents-EDU","ddd":0,"assets":[{"id":"comp_0","nm":"Recents_EDU Loop","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"CNTL || playback","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":0,"ix":3},"y":{"a":0,"k":0,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Picker","np":3,"mn":"Pseudo/@@WcSiov6sT3a4/s0XPKYEOQ","ix":1,"en":1,"ef":[{"ty":7,"nm":"Menu","mn":"Pseudo/@@WcSiov6sT3a4/s0XPKYEOQ-0001","ix":1,"v":{"a":0,"k":2,"ix":1}}]},{"ty":5,"nm":"OUTPUT","np":3,"mn":"ADBE Slider Control","ix":2,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"k":[{"s":[0],"t":142,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.001],"t":143,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.002],"t":144,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.003],"t":145,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.004],"t":146,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.006],"t":147,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.008],"t":148,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.01],"t":149,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.012],"t":150,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.016],"t":151,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.02],"t":152,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.025],"t":153,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.031],"t":154,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.038],"t":155,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.047],"t":156,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.059],"t":157,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.073],"t":158,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.091],"t":159,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.116],"t":160,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.15],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.196],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.249],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.306],"t":164,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.366],"t":165,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.425],"t":166,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.481],"t":167,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.53],"t":168,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.575],"t":169,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.614],"t":170,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.648],"t":171,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.678],"t":172,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.706],"t":173,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.73],"t":174,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.752],"t":175,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.772],"t":176,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.79],"t":177,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.807],"t":178,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.822],"t":179,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.836],"t":180,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.849],"t":181,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.861],"t":182,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.873],"t":183,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.883],"t":184,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.892],"t":185,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.901],"t":186,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.91],"t":187,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.917],"t":188,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.925],"t":189,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.931],"t":190,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.937],"t":191,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.943],"t":192,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.949],"t":193,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.954],"t":194,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.958],"t":195,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.963],"t":196,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.967],"t":197,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.97],"t":198,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.974],"t":199,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.977],"t":200,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.98],"t":201,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.983],"t":202,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.985],"t":203,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.987],"t":204,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.989],"t":205,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.991],"t":206,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.993],"t":207,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.994],"t":208,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.996],"t":209,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.997],"t":210,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.998],"t":211,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.998],"t":212,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.999],"t":213,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1],"t":215,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.009],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.038],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.093],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.193],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.4],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.636],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.739],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.8],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.84],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.871],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.894],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.912],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.928],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.94],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.951],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.959],"t":266,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.967],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.973],"t":268,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.979],"t":269,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.983],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.987],"t":271,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.99],"t":272,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.993],"t":273,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.995],"t":274,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.997],"t":275,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.998],"t":276,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.999],"t":278,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2],"t":380,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.009],"t":381,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.038],"t":382,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.093],"t":383,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.193],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.4],"t":385,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.636],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.739],"t":387,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.8],"t":388,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.84],"t":389,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.871],"t":390,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.894],"t":391,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.912],"t":392,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.928],"t":393,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.94],"t":394,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.951],"t":395,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.959],"t":396,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.967],"t":397,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.973],"t":398,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.979],"t":399,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.983],"t":400,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.987],"t":401,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.99],"t":402,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.993],"t":403,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.995],"t":404,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.997],"t":405,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.999],"t":408,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}}]},{"ty":5,"nm":"Keys","np":3,"mn":"ADBE Slider Control","ix":3,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.831],"y":[0.109]},"o":{"x":[0.458],"y":[0.053]},"t":142,"s":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.15],"y":[0.43]},"t":161,"s":[0.15]},{"t":217,"s":[1],"h":1},{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":250,"s":[1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":255,"s":[1.4]},{"t":280,"s":[2],"h":1},{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":380,"s":[2]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":385,"s":[2.4]},{"t":410,"s":[3]}],"ix":1}}]},{"ty":5,"nm":"State (holds)","np":3,"mn":"ADBE Slider Control","ix":4,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":0,"k":0,"ix":1}}]}],"shapes":[],"ip":0,"op":451,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Null :: Taskbar drop","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[252,278,0],"t":186,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,278.45,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,279.615,0],"t":188,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,281.252,0],"t":189,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,283.166,0],"t":190,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,287.233,0],"t":192,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,289.181,0],"t":193,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,290.982,0],"t":194,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,292.599,0],"t":195,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,294.012,0],"t":196,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,295.216,0],"t":197,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,296.216,0],"t":198,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,297.023,0],"t":199,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,297.655,0],"t":200,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.131,0],"t":201,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.474,0],"t":202,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.705,0],"t":203,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.465,0],"t":212,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.226,0],"t":215,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298,0],"t":377,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.382,0],"t":378,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,299.372,0],"t":379,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,300.764,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,302.391,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,305.848,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,307.504,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,309.035,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,310.409,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,311.611,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,312.634,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,313.483,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,314.169,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,314.706,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.112,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.403,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.717,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.474,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.192,0],"t":406,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"Taskbar Lofi","parent":3,"refId":"comp_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":134,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":143,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":432,"s":[100]},{"t":444,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":0,"ix":3},"y":{"k":[{"s":[26.984],"t":127,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.971],"t":128,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.95],"t":129,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.921],"t":130,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.882],"t":131,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.83],"t":132,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.765],"t":133,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.685],"t":134,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.589],"t":135,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.478],"t":136,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.349],"t":137,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.205],"t":138,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.072],"t":139,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.926],"t":140,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.764],"t":141,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.589],"t":142,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.397],"t":143,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.187],"t":144,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.959],"t":145,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.711],"t":146,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.44],"t":147,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.146],"t":148,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.826],"t":149,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.479],"t":150,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.1],"t":151,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[22.686],"t":152,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[22.236],"t":153,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[21.745],"t":154,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[21.207],"t":155,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[20.616],"t":156,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.967],"t":157,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.248],"t":158,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[18.457],"t":159,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.578],"t":160,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.602],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.514],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.303],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[12.954],"t":164,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[11.477],"t":165,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[9.885],"t":166,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[8.215],"t":167,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[6.526],"t":168,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[4.878],"t":169,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[3.338],"t":170,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.928],"t":171,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.659],"t":172,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-0.475],"t":173,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-1.485],"t":174,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-2.388],"t":175,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-3.192],"t":176,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-3.911],"t":177,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-4.556],"t":178,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-5.136],"t":179,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-5.662],"t":180,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-6.135],"t":181,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-6.563],"t":182,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-6.951],"t":183,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-7.303],"t":184,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-7.622],"t":185,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-7.913],"t":186,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.175],"t":187,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.413],"t":188,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.628],"t":189,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.823],"t":190,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.998],"t":191,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.155],"t":192,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.296],"t":193,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.42],"t":194,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.531],"t":195,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.627],"t":196,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.711],"t":197,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.783],"t":198,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.843],"t":199,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.893],"t":200,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.933],"t":201,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.963],"t":202,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.984],"t":203,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.996],"t":204,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}},"a":{"a":0,"k":[91,15,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Super Slider","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.64],"y":[0.48]},"o":{"x":[0.36],"y":[0]},"t":121,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":138,"s":[17.5]},{"t":205,"s":[100]}],"ix":1}}]}],"w":182,"h":30,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":3,"nm":"Focus Task :: Lift & Drop","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":252,"ix":3},"y":{"k":[{"s":[157.385],"t":145,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.28],"t":147,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.128],"t":149,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.026],"t":150,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.901],"t":151,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.75],"t":152,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.564],"t":153,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.335],"t":154,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.054],"t":155,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[155.706],"t":156,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[155.275],"t":157,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[154.73],"t":158,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[154.03],"t":159,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[153.103],"t":160,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[151.8],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[150.035],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[148.047],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.867],"t":164,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[143.589],"t":165,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[141.341],"t":166,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[139.241],"t":167,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[137.346],"t":168,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[135.666],"t":169,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[134.185],"t":170,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[132.878],"t":171,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[131.718],"t":172,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[130.684],"t":173,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[129.755],"t":174,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[128.916],"t":175,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[128.155],"t":176,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[127.462],"t":177,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[126.829],"t":178,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[126.249],"t":179,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[125.715],"t":180,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[125.221],"t":181,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[124.765],"t":182,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[124.343],"t":183,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[123.951],"t":184,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[123.587],"t":185,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[123.249],"t":186,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.934],"t":187,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.641],"t":188,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.369],"t":189,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.114],"t":190,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.877],"t":191,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.657],"t":192,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.452],"t":193,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.26],"t":194,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.082],"t":195,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.918],"t":196,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.764],"t":197,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.623],"t":198,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.492],"t":199,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.371],"t":200,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.261],"t":201,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.158],"t":202,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.065],"t":203,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.98],"t":204,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.903],"t":205,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.835],"t":206,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.718],"t":208,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.629],"t":210,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.51],"t":215,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.5],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.746],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.54],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.071],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[124.808],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[130.5],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[136.982],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[139.835],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[141.489],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[142.613],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[143.442],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[144.082],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[144.593],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.01],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.354],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.642],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.884],"t":266,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.089],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.262],"t":268,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.409],"t":269,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.534],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.638],"t":271,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.725],"t":272,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.857],"t":274,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[147],"t":380,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[147.094],"t":381,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[147.397],"t":382,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[147.982],"t":383,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[149.027],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[151.2],"t":385,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[153.675],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[154.764],"t":387,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[155.396],"t":388,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[155.825],"t":389,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.141],"t":390,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.386],"t":391,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.581],"t":392,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.74],"t":393,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.871],"t":394,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.981],"t":395,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.074],"t":396,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.218],"t":398,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.362],"t":401,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"matte","parent":5,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"k":[{"s":[503.613,314.758],"t":144,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[503.134,314.459],"t":146,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.832,314.27],"t":147,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.464,314.04],"t":148,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.025,313.765],"t":149,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[501.487,313.429],"t":150,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[500.824,313.015],"t":151,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[500.023,312.514],"t":152,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[499.032,311.895],"t":153,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[497.818,311.136],"t":154,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[496.328,310.205],"t":155,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[494.484,309.053],"t":156,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[492.194,307.621],"t":157,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[489.307,305.817],"t":158,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[485.592,303.495],"t":159,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[480.67,300.419],"t":160,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[473.76,296.1],"t":161,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[464.395,290.247],"t":162,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[453.849,283.656],"t":163,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[442.286,276.429],"t":164,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[430.198,268.874],"t":165,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[418.274,261.421],"t":166,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[407.131,254.457],"t":167,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[397.077,248.173],"t":168,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[388.165,242.603],"t":169,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[380.31,237.694],"t":170,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[373.373,233.358],"t":171,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[367.218,229.511],"t":172,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[361.732,226.082],"t":173,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[356.803,223.002],"t":174,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[352.354,220.221],"t":175,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[348.318,217.699],"t":176,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[344.643,215.402],"t":177,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[341.283,213.302],"t":178,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[338.205,211.378],"t":179,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[335.37,209.606],"t":180,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[332.752,207.97],"t":181,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[330.33,206.456],"t":182,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[328.092,205.058],"t":183,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[326.012,203.757],"t":184,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[324.082,202.552],"t":185,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[322.291,201.432],"t":186,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[320.617,200.386],"t":187,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[319.062,199.414],"t":188,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[317.618,198.512],"t":189,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[316.267,197.667],"t":190,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[315.013,196.883],"t":191,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[313.845,196.153],"t":192,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[312.756,195.472],"t":193,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[311.738,194.837],"t":194,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[310.793,194.246],"t":195,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[309.921,193.7],"t":196,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[309.107,193.192],"t":197,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[308.359,192.724],"t":198,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[307.663,192.289],"t":199,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[307.02,191.888],"t":200,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[306.436,191.522],"t":201,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[305.891,191.182],"t":202,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[305.399,190.874],"t":203,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[304.946,190.591],"t":204,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[304.539,190.337],"t":205,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[304.178,190.112],"t":206,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[303.85,189.906],"t":207,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[303.555,189.722],"t":208,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[303.306,189.566],"t":209,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[303.082,189.427],"t":210,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[302.892,189.308],"t":211,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[302.617,189.135],"t":213,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[302.4,189],"t":250,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[302.247,188.904],"t":251,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[301.752,188.595],"t":252,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[300.798,187.999],"t":253,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[299.093,186.933],"t":254,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[295.546,184.716],"t":255,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[291.506,182.192],"t":256,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[289.729,181.08],"t":257,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[288.698,180.436],"t":258,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.998,179.999],"t":259,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.481,179.676],"t":260,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.082,179.427],"t":261,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.764,179.227],"t":262,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.504,179.065],"t":263,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.29,178.931],"t":264,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.11,178.819],"t":265,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.832,178.645],"t":267,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.555,178.472],"t":270,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.272,178.295],"t":278,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.264,178.29],"t":380,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.222,179.514],"t":381,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[293.538,183.461],"t":382,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[305.714,191.071],"t":383,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[327.48,204.675],"t":384,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[372.758,232.974],"t":385,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[424.317,265.198],"t":386,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[447.009,279.381],"t":387,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[460.167,287.605],"t":388,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[469.103,293.19],"t":389,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[475.697,297.31],"t":390,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[480.788,300.492],"t":391,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[484.853,303.033],"t":392,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[488.172,305.107],"t":393,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[490.906,306.816],"t":394,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[493.198,308.249],"t":395,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[495.121,309.451],"t":396,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[496.752,310.47],"t":397,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[498.133,311.333],"t":398,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[499.301,312.063],"t":399,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[500.29,312.681],"t":400,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[501.123,313.202],"t":401,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[501.814,313.634],"t":402,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.391,313.994],"t":403,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.861,314.288],"t":404,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[503.238,314.524],"t":405,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[503.53,314.706],"t":406,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}}]},"p":{"a":0,"k":[0,0],"ix":3},"r":{"k":[{"s":[27.974],"t":144,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.959],"t":145,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.942],"t":146,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.922],"t":147,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.898],"t":148,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.869],"t":149,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.833],"t":150,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.789],"t":151,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.736],"t":152,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.67],"t":153,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.589],"t":154,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.49],"t":155,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.368],"t":156,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.216],"t":157,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.024],"t":158,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.777],"t":159,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.45],"t":160,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.991],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.37],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.669],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.901],"t":164,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.098],"t":165,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[22.306],"t":166,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[21.566],"t":167,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[20.898],"t":168,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[20.306],"t":169,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.785],"t":170,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.324],"t":171,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[18.915],"t":172,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[18.551],"t":173,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[18.223],"t":174,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.928],"t":175,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.66],"t":176,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.416],"t":177,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.193],"t":178,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.988],"t":179,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.8],"t":180,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.626],"t":181,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.465],"t":182,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.316],"t":183,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.178],"t":184,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.05],"t":185,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.931],"t":186,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.82],"t":187,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.717],"t":188,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.621],"t":189,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.531],"t":190,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.448],"t":191,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.37],"t":192,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.298],"t":193,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.23],"t":194,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.167],"t":195,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.11],"t":196,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.055],"t":197,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.006],"t":198,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.96],"t":199,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.917],"t":200,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.878],"t":201,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.842],"t":202,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.809],"t":203,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.779],"t":204,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.752],"t":205,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.728],"t":206,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.706],"t":207,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.687],"t":208,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.67],"t":209,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.655],"t":210,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.643],"t":211,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.633],"t":212,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.624],"t":213,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.61],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.603],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.579],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.532],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.45],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.278],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.082],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.996],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.946],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.912],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.887],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.868],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.853],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.84],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.83],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.821],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.808],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.794],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.78],"t":278,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.78],"t":380,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.907],"t":381,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.318],"t":382,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.109],"t":383,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.524],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.468],"t":385,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[22.82],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.295],"t":387,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.15],"t":388,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.731],"t":389,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.16],"t":390,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.491],"t":391,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.755],"t":392,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.971],"t":393,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.149],"t":394,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.298],"t":395,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.423],"t":396,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.529],"t":397,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.619],"t":398,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.694],"t":399,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.759],"t":400,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.813],"t":401,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.858],"t":402,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.895],"t":403,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.926],"t":404,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.95],"t":405,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.969],"t":406,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.993],"t":408,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":0,"nm":"Recents_LofiApp","parent":6,"tt":1,"tp":6,"refId":"comp_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[252,157.5,0],"ix":1,"l":2},"s":{"k":[{"s":[99.923,99.923,100],"t":144,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.828,99.828,100],"t":146,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.768,99.768,100],"t":147,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.695,99.695,100],"t":148,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.608,99.608,100],"t":149,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.501,99.501,100],"t":150,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.37,99.37,100],"t":151,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.211,99.211,100],"t":152,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.014,99.014,100],"t":153,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.773,98.773,100],"t":154,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.478,98.478,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.112,98.112,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.658,97.658,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.085,97.085,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.348,96.348,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.371,95.371,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94,94,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.142,92.142,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.049,90.049,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[87.755,87.755,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.357,85.357,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[82.991,82.991,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.78,80.78,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[78.785,78.785,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[77.017,77.017,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[75.458,75.458,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[74.082,74.082,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[72.861,72.861,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[71.772,71.772,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70.794,70.794,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[69.911,69.911,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[69.111,69.111,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.382,68.382,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[67.715,67.715,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[67.104,67.104,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[66.542,66.542,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[66.022,66.022,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[65.542,65.542,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[65.098,65.098,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[64.685,64.685,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[64.302,64.302,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.947,63.947,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.615,63.615,100],"t":187,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.306,63.306,100],"t":188,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.02,63.02,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[62.751,62.751,100],"t":190,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[62.503,62.503,100],"t":191,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[62.271,62.271,100],"t":192,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[62.055,62.055,100],"t":193,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.853,61.853,100],"t":194,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.665,61.665,100],"t":195,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.492,61.492,100],"t":196,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.331,61.331,100],"t":197,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.182,61.182,100],"t":198,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.044,61.044,100],"t":199,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.917,60.917,100],"t":200,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.801,60.801,100],"t":201,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.693,60.693,100],"t":202,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.595,60.595,100],"t":203,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.505,60.505,100],"t":204,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.424,60.424,100],"t":205,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.353,60.353,100],"t":206,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.288,60.288,100],"t":207,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.229,60.229,100],"t":208,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.18,60.18,100],"t":209,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.135,60.135,100],"t":210,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.098,60.098,100],"t":211,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.043,60.043,100],"t":213,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60,60,100],"t":250,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.97,59.97,100],"t":251,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.871,59.871,100],"t":252,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.682,59.682,100],"t":253,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.344,59.344,100],"t":254,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[58.64,58.64,100],"t":255,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.839,57.839,100],"t":256,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.486,57.486,100],"t":257,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.281,57.281,100],"t":258,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.142,57.142,100],"t":259,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.04,57.04,100],"t":260,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.961,56.961,100],"t":261,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.898,56.898,100],"t":262,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.846,56.846,100],"t":263,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.804,56.804,100],"t":264,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.768,56.768,100],"t":265,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.713,56.713,100],"t":267,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.658,56.658,100],"t":270,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.602,56.602,100],"t":278,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.6,56.6,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.989,56.989,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[58.242,58.242,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.657,60.657,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[64.976,64.976,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[73.96,73.96,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[84.19,84.19,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.692,88.692,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[91.303,91.303,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.076,93.076,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.384,94.384,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.394,95.394,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.201,96.201,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.859,96.859,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.402,97.402,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.857,97.857,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.238,98.238,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.562,98.562,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.836,98.836,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.068,99.068,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.264,99.264,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.429,99.429,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.566,99.566,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.681,99.681,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.774,99.774,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.849,99.849,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.907,99.907,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"w":504,"h":315,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":7,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"t":277,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,-30.035,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[176.678,176.678,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"second Tasks Zoom back","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.8,0.8,0.8],"y":[0.15,0.15,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":380,"s":[100,100,100]},{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0.7,0.7,0]},"t":385,"s":[98,98,100]},{"t":410,"s":[95,95,100]}],"ix":6,"l":2}},"ao":0,"shapes":[],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Null :: Reposition Side Task","parent":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.8,"y":0.15},"o":{"x":0.3,"y":0},"t":250,"s":[-318.4,-38,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.7},"t":255,"s":[-277.34,-48.1,0],"to":[0,0,0],"ti":[0,0,0]},{"t":280,"s":[-215.75,-63.25,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":12,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":277,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-111.72,0],"t":250,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-111.197,0],"t":251,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-109.514,0],"t":252,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-106.268,0],"t":253,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-100.462,0],"t":254,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-88.39,0],"t":255,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-74.643,0],"t":256,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-68.591,0],"t":257,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-65.083,0],"t":258,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-62.7,0],"t":259,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-60.943,0],"t":260,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-59.584,0],"t":261,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-58.5,0],"t":262,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-57.616,0],"t":263,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-56.886,0],"t":264,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-56.276,0],"t":265,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-55.762,0],"t":266,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-55.328,0],"t":267,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.96,0],"t":268,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.648,0],"t":269,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.385,0],"t":270,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.163,0],"t":271,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.977,0],"t":272,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.824,0],"t":273,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.698,0],"t":274,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.598,0],"t":275,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.521,0],"t":276,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.463,0],"t":277,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.424,0],"t":278,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":10,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.963},"t":217,"s":[-84.8,0,0],"to":[0,0,0],"ti":[0,0,0]},{"t":250,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.8,0.8],"y":[0.15,0.15]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":250,"s":[302.4,189]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0.7]},"t":255,"s":[227.56,142.34]},{"t":280,"s":[115.3,72.35]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":250,"s":[14.6]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":255,"s":[14.272]},{"t":280,"s":[13.78]}],"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":14,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":277,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-53.175,0],"t":197,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.175,0],"t":510,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.8,"y":0.15},"o":{"x":0.3,"y":0},"t":250,"s":[-411.95,20.325,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.7},"t":255,"s":[-333.47,29.183,0],"to":[0,0,0],"ti":[0,0,0]},{"t":280,"s":[-215.75,42.47,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[115.3,72.35],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":13.78,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0}]},{"id":"comp_1","nm":"Taskbar Lofi","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"app - 5","parent":9,"sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[51.5,0,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.652,0,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.136,0,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[53.013,0,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.449,0,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.806,0,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[61.3,0,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[66.437,0,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[68.94,0,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[70.432,0,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[71.462,0,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[72.229,0,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[72.83,0,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[73.314,0,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[73.714,0,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.048,0,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.334,0,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.578,0,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.789,0,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.971,0,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.131,0,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.269,0,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.389,0,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.493,0,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.584,0,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.663,0,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.731,0,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.789,0,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.839,0,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.915,0,0],"t":185,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.982,0,0],"t":188,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[76,0,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.779,0,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.066,0,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[73.709,0,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[71.271,0,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[66.2,0,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[60.425,0,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.886,0,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.41,0,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.409,0,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.67,0,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.1,0,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[53.646,0,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[53.275,0,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.968,0,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.711,0,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.495,0,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.312,0,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.157,0,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.026,0,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.916,0,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.822,0,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.745,0,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.68,0,0],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.628,0,0],"t":404,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.585,0,0],"t":405,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.552,0,0],"t":406,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.501,0,0],"t":409,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[167,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7511","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[167,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 5","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"app - 4","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[123.341,15,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.654,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.223,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[125.146,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[126.662,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[129.549,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[132.838,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[134.455,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[135.421,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[136.083,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[136.576,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[136.962,15,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.272,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.528,15,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.742,15,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.924,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.08,15,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.216,15,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.334,15,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.437,15,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.527,15,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.606,15,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.734,15,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.869,15,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.864,15,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.402,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.527,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[135.96,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[132.701,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[129.002,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[127.358,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[126.406,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[125.763,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[125.288,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.923,15,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.633,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.396,15,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.199,15,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.034,15,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.895,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.776,15,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.675,15,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.589,15,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.516,15,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.403,15,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.299,15,0],"t":405,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[139,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7508","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[139,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 4","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"app - 3","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[104.041,15,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.182,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.436,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.844,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[105.517,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[106.808,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[108.265,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[108.981,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[109.409,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[109.703,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[109.923,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.092,15,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.228,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.341,15,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.436,15,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.517,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.587,15,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.648,15,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.746,15,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.853,15,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.956,15,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.938,15,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.73,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.34,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[109.649,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[108.197,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[106.559,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[105.828,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[105.403,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[105.117,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.906,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.745,15,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.616,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.511,15,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.424,15,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.35,15,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.288,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.19,15,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.091,15,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[111,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7507","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[111,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 3","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"app - 2","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[84.704,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.639,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.537,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.371,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.048,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.684,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.505,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.398,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.324,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.271,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.195,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.123,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.045,15,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.068,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.166,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.338,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.702,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.112,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.294,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.399,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.47,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.521,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.593,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.676,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[83,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7506","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[83,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 2","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"app - 1","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[65.439,15,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.229,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.849,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.236,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[63.226,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[61.296,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[59.111,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[58.033,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.388,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.945,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.616,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.359,15,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.154,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.984,15,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.842,15,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.72,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.616,15,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.525,15,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.447,15,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.378,15,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.317,15,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.265,15,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.219,15,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.178,15,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.143,15,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.113,15,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.066,15,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.012,15,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55,15,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.092,15,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.403,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.986,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.027,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[59.212,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[61.67,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[62.762,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[63.396,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[63.825,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.141,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.385,15,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.578,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.736,15,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.867,15,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.977,15,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.07,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.149,15,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.217,15,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.274,15,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.323,15,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.364,15,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.426,15,0],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.491,15,0],"t":407,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[55,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7505","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[55,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"divider","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":90,"ix":10},"p":{"k":[{"s":[51,15,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.913,15,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.615,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.073,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.194,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[47.751,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[45.001,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[41.869,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[40.328,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[39.409,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.778,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.309,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.941,15,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.645,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.402,15,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.199,15,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.025,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.876,15,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.747,15,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.635,15,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.536,15,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.451,15,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.376,15,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.31,15,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.253,15,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.203,15,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.161,15,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.124,15,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.093,15,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.068,15,0],"t":184,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.047,15,0],"t":185,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.017,15,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36,15,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.129,15,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.569,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.403,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.895,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[41.999,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[45.522,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[47.088,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[47.994,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[48.607,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.059,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.407,15,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.683,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.909,15,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.096,15,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.253,15,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.386,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.499,15,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.596,15,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.677,15,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.747,15,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.806,15,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.854,15,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.895,15,0],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.927,15,0],"t":404,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.973,15,0],"t":406,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"k":[{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2,-0.5],[2,-0.5]],"c":false}],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.019,-0.5],[2.019,-0.5]],"c":false}],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.077,-0.5],[2.077,-0.5]],"c":false}],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.185,-0.5],[2.185,-0.5]],"c":false}],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.361,-0.5],[2.361,-0.5]],"c":false}],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.65,-0.5],[2.65,-0.5]],"c":false}],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.2,-0.5],[3.2,-0.5]],"c":false}],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.829,-0.5],[3.829,-0.5]],"c":false}],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.136,-0.5],[4.136,-0.5]],"c":false}],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.318,-0.5],[4.318,-0.5]],"c":false}],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.444,-0.5],[4.444,-0.5]],"c":false}],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.538,-0.5],[4.538,-0.5]],"c":false}],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.612,-0.5],[4.612,-0.5]],"c":false}],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.671,-0.5],[4.671,-0.5]],"c":false}],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.72,-0.5],[4.72,-0.5]],"c":false}],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.761,-0.5],[4.761,-0.5]],"c":false}],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.796,-0.5],[4.796,-0.5]],"c":false}],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.826,-0.5],[4.826,-0.5]],"c":false}],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.852,-0.5],[4.852,-0.5]],"c":false}],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.874,-0.5],[4.874,-0.5]],"c":false}],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.894,-0.5],[4.894,-0.5]],"c":false}],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.91,-0.5],[4.91,-0.5]],"c":false}],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.925,-0.5],[4.925,-0.5]],"c":false}],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.938,-0.5],[4.938,-0.5]],"c":false}],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.949,-0.5],[4.949,-0.5]],"c":false}],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.959,-0.5],[4.959,-0.5]],"c":false}],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.967,-0.5],[4.967,-0.5]],"c":false}],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.974,-0.5],[4.974,-0.5]],"c":false}],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.98,-0.5],[4.98,-0.5]],"c":false}],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.99,-0.5],[4.99,-0.5]],"c":false}],"t":185,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.996,-0.5],[4.996,-0.5]],"c":false}],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,-0.5],[5,-0.5]],"c":false}],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.973,-0.5],[4.973,-0.5]],"c":false}],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.887,-0.5],[4.887,-0.5]],"c":false}],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.72,-0.5],[4.72,-0.5]],"c":false}],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.421,-0.5],[4.421,-0.5]],"c":false}],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.8,-0.5],[3.8,-0.5]],"c":false}],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.093,-0.5],[3.093,-0.5]],"c":false}],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.782,-0.5],[2.782,-0.5]],"c":false}],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.601,-0.5],[2.601,-0.5]],"c":false}],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.479,-0.5],[2.479,-0.5]],"c":false}],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.388,-0.5],[2.388,-0.5]],"c":false}],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.318,-0.5],[2.318,-0.5]],"c":false}],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.263,-0.5],[2.263,-0.5]],"c":false}],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.217,-0.5],[2.217,-0.5]],"c":false}],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.18,-0.5],[2.18,-0.5]],"c":false}],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.148,-0.5],[2.148,-0.5]],"c":false}],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.122,-0.5],[2.122,-0.5]],"c":false}],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.099,-0.5],[2.099,-0.5]],"c":false}],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.081,-0.5],[2.081,-0.5]],"c":false}],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.064,-0.5],[2.064,-0.5]],"c":false}],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.051,-0.5],[2.051,-0.5]],"c":false}],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.039,-0.5],[2.039,-0.5]],"c":false}],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.03,-0.5],[2.03,-0.5]],"c":false}],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.022,-0.5],[2.022,-0.5]],"c":false}],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.01,-0.5],[2.01,-0.5]],"c":false}],"t":405,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.006,-0.5],[2.006,-0.5]],"c":false}],"t":406,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.004,-0.5],[2.004,-0.5]],"c":false}],"t":407,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.001,-0.5],[2.001,-0.5]],"c":false}],"t":408,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}]},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"divider","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[-52.349,0.652,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.453,0.652,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.813,0.652,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.464,0.652,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.515,0.652,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.247,0.652,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-59.565,0.652,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-63.323,0.652,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-65.162,0.652,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-66.258,0.652,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-67.015,0.652,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-67.578,0.652,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.019,0.652,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.375,0.652,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.668,0.652,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.914,0.652,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.122,0.652,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.301,0.652,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.456,0.652,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.59,0.652,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.708,0.652,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.81,0.652,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.9,0.652,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.978,0.652,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.047,0.652,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.106,0.652,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.157,0.652,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.2,0.652,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.268,0.652,0],"t":184,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.328,0.652,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.349,0.652,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.193,0.652,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.662,0.652,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.662,0.652,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-66.874,0.652,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-63.132,0.652,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-58.906,0.652,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-57.04,0.652,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.956,0.652,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.22,0.652,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.678,0.652,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.259,0.652,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.925,0.652,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.654,0.652,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.43,0.652,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.241,0.652,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.082,0.652,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.947,0.652,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.831,0.652,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.734,0.652,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.65,0.652,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.58,0.652,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.522,0.652,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.474,0.652,0],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.435,0.652,0],"t":404,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.404,0.652,0],"t":405,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.354,0.652,0],"t":408,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[6.826,6.826,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 12","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,9.501],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 12","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 11","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,2.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 11","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[9.5,2.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.185,0.148],[0,0],[0,0],[0,0],[-0.086,0.24],[0,0.271],[0.468,0.462],[0.671,0],[0.468,-0.468],[0,-0.671],[-0.462,-0.468],[-0.671,0],[-0.24,0.086]],"o":[[0,0],[0,0],[0,0],[0.148,-0.185],[0.086,-0.24],[0,-0.671],[-0.462,-0.468],[-0.671,0],[-0.462,0.462],[0,0.671],[0.468,0.462],[0.271,0],[0.24,-0.086]],"v":[[0.48,0.998],[2.809,3.326],[3.326,2.809],[0.998,0.48],[1.349,-0.157],[1.478,-0.924],[0.776,-2.624],[-0.924,-3.326],[-2.633,-2.624],[-3.326,-0.924],[-2.633,0.785],[-0.924,1.478],[-0.157,1.349]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":5,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.326,-0.326],[0.462,0],[0.326,0.32],[0,0.462],[-0.32,0.32],[-0.462,0],[-0.32,-0.326],[0,-0.462]],"o":[[-0.32,0.32],[-0.462,0],[-0.32,-0.326],[0,-0.462],[0.326,-0.326],[0.462,0],[0.326,0.32],[0,0.462]],"v":[[0.249,0.259],[-0.924,0.739],[-2.106,0.259],[-2.587,-0.924],[-2.106,-2.097],[-0.924,-2.587],[0.249,-2.097],[0.739,-0.924]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":5,"nm":"Merge Paths 2","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"st","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0.4,"ix":5},"lc":1,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"icon","np":6,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[10.326,10.326],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"icon","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[91,15,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"k":[{"s":[120,4],"t":155,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.383,4.161],"t":156,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[121.592,4.668],"t":157,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[123.818,5.601],"t":158,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[127.463,7.13],"t":159,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[133.427,9.631],"t":160,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[144.8,14.4],"t":161,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[157.801,19.852],"t":162,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[164.141,22.511],"t":163,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[167.915,24.093],"t":164,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[170.516,25.184],"t":165,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[172.458,25.999],"t":166,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[173.978,26.636],"t":167,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[175.203,27.15],"t":168,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[176.216,27.574],"t":169,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[177.065,27.931],"t":170,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[177.788,28.234],"t":171,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[178.406,28.493],"t":172,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[178.938,28.716],"t":173,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[179.399,28.909],"t":174,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[179.8,29.078],"t":175,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[180.149,29.224],"t":176,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[180.454,29.352],"t":177,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[180.718,29.463],"t":178,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[180.949,29.559],"t":179,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.148,29.643],"t":180,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.32,29.715],"t":181,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.467,29.777],"t":182,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.592,29.829],"t":183,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.697,29.873],"t":184,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.784,29.91],"t":185,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.855,29.939],"t":186,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.909,29.962],"t":187,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.978,29.991],"t":189,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[182,30],"t":380,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.445,29.767],"t":381,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[179.655,29.017],"t":382,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[176.204,27.569],"t":383,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[170.034,24.982],"t":384,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[157.2,19.6],"t":385,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[142.586,13.472],"t":386,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[136.154,10.774],"t":387,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[132.424,9.21],"t":388,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[129.891,8.148],"t":389,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[128.022,7.364],"t":390,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[126.579,6.759],"t":391,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[125.427,6.276],"t":392,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[124.487,5.881],"t":393,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[123.712,5.556],"t":394,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[123.062,5.284],"t":395,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[122.517,5.055],"t":396,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[122.055,4.862],"t":397,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[121.663,4.697],"t":398,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[121.332,4.559],"t":399,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[121.051,4.441],"t":400,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.815,4.342],"t":401,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.62,4.26],"t":402,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.456,4.191],"t":403,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.323,4.135],"t":404,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.216,4.091],"t":405,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.133,4.056],"t":406,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.073,4.03],"t":407,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.03,4.013],"t":408,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.008,4.003],"t":409,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}}]},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":32.672,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Taskbar Lofi","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]},{"id":"comp_2","nm":"Recents_LofiApp","fr":60,"pfr":1,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[339.937,151.75,0],"ix":2,"l":2},"a":{"a":0,"k":[339.937,151.75,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.021,-1.766],[0,0],[-2.043,0],[0,0],[1.022,1.767]],"o":[[-1.021,-1.766],[0,0],[-1.022,1.767],[0,0],[2.043,0],[0,0]],"v":[[2.297,-7.675],[-2.297,-7.675],[-9.64,5.025],[-7.343,9],[7.343,9],[9.64,5.025]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"rd","nm":"Round Corners 1","r":{"a":0,"k":9,"ix":1},"ix":2,"mn":"ADBE Vector Filter - RC","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Triangle","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[481.874,21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Triangle","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[457.874,21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[292,25],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Text field","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[334,279],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Text field","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[109,28],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[425.5,208.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[160,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":14,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[400,158.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":1,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[126,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":14,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Received","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[251,78.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Received","np":1,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[334,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[340,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":16,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Message","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82,171.125,0],"ix":2,"l":2},"a":{"a":0,"k":[82,171.125,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,177.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 4","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,165.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 3","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,171.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 2","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82.5,140.5,0],"ix":2,"l":2},"a":{"a":0,"k":[82,140.938,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[132,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Search","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[82,31.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"header","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,257.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 6","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,245.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 5","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,251.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 3","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[132,64],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Message","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[82,171],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"block","np":1,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,96.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":1,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,84.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":1,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,90.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 1","np":1,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app only","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","parent":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":37,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":47,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":250,"s":[100]},{"t":256,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,29.984,0],"t":127,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.965,0],"t":128,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.936,0],"t":129,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.894,0],"t":130,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.84,0],"t":131,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.77,0],"t":132,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.682,0],"t":133,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.574,0],"t":134,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.445,0],"t":135,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.294,0],"t":136,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.121,0],"t":137,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.925,0],"t":138,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.746,0],"t":139,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.548,0],"t":140,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.33,0],"t":141,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.092,0],"t":142,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,27.832,0],"t":143,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,27.548,0],"t":144,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,27.239,0],"t":145,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,26.903,0],"t":146,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,26.536,0],"t":147,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,26.14,0],"t":148,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,25.709,0],"t":149,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,25.241,0],"t":150,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,24.73,0],"t":151,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,24.171,0],"t":152,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,23.563,0],"t":153,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,22.898,0],"t":154,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,22.171,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,21.373,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,20.496,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,19.524,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,18.451,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,17.263,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,15.943,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,14.475,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,12.841,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,11.018,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,9.023,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,6.87,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,4.614,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,2.333,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,0.106,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-1.975,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-3.877,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-5.591,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-7.125,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-8.492,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-9.714,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-10.799,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-11.771,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-12.643,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-13.428,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-14.138,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-14.777,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-15.355,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-15.879,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-16.354,0],"t":184,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-16.784,0],"t":185,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-17.177,0],"t":186,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-17.532,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-17.854,0],"t":188,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-18.146,0],"t":189,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-18.409,0],"t":190,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-18.645,0],"t":191,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-18.858,0],"t":192,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.048,0],"t":193,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.217,0],"t":194,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.366,0],"t":195,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.496,0],"t":196,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.61,0],"t":197,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.707,0],"t":198,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.788,0],"t":199,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.856,0],"t":200,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.911,0],"t":201,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.954,0],"t":202,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.984,0],"t":203,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Super Slider","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.64],"y":[0.48]},"o":{"x":[0.36],"y":[0]},"t":121,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":138,"s":[17.5]},{"t":205,"s":[100]}],"ix":1}}]}],"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":62,"s":[41,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":0.56},"o":{"x":0.44,"y":0.44},"t":72,"s":[33,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":248,"s":[33,0],"to":[0,0],"ti":[0,0]},{"t":258,"s":[41,0]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"right circle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":62,"s":[-41,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":0.56},"o":{"x":0.44,"y":0.44},"t":72,"s":[-33,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":248,"s":[-33,0],"to":[0,0],"ti":[0,0]},{"t":258,"s":[-41,0]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"left circle","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"size","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":37,"op":345,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,459,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[200,128],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":18,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Frame 1321317559","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"matte","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Recents_EDU Loop","parent":5,"tt":1,"tp":5,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[252,157.5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":504,"h":315,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980401039,0.768627464771,0.627451002598,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"op","nm":"Stroke align: Outside","a":{"k":[{"s":[7],"t":0,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[7],"t":511,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"frame","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}],"markers":[{"tm":142,"cm":"drag with gesture","dr":108},{"tm":217,"cm":"onPause","dr":0},{"tm":250,"cm":"release playback realtime","dr":36}],"props":{}}
\ No newline at end of file +{"v":"5.12.1","fr":60,"ip":0,"op":511,"w":554,"h":564,"nm":"Trackpad-JSON_Recents-EDU","ddd":0,"assets":[{"id":"comp_0","nm":"Recents_EDU Loop","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"CNTL || playback","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":0,"ix":3},"y":{"a":0,"k":0,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Picker","np":3,"mn":"Pseudo/@@WcSiov6sT3a4/s0XPKYEOQ","ix":1,"en":1,"ef":[{"ty":7,"nm":"Menu","mn":"Pseudo/@@WcSiov6sT3a4/s0XPKYEOQ-0001","ix":1,"v":{"a":0,"k":2,"ix":1}}]},{"ty":5,"nm":"OUTPUT","np":3,"mn":"ADBE Slider Control","ix":2,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"k":[{"s":[0],"t":142,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.001],"t":143,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.002],"t":144,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.003],"t":145,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.004],"t":146,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.006],"t":147,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.008],"t":148,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.01],"t":149,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.012],"t":150,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.016],"t":151,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.02],"t":152,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.025],"t":153,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.031],"t":154,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.038],"t":155,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.047],"t":156,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.059],"t":157,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.073],"t":158,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.091],"t":159,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.116],"t":160,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.15],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.196],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.249],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.306],"t":164,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.366],"t":165,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.425],"t":166,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.481],"t":167,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.53],"t":168,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.575],"t":169,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.614],"t":170,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.648],"t":171,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.678],"t":172,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.706],"t":173,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.73],"t":174,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.752],"t":175,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.772],"t":176,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.79],"t":177,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.807],"t":178,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.822],"t":179,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.836],"t":180,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.849],"t":181,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.861],"t":182,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.873],"t":183,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.883],"t":184,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.892],"t":185,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.901],"t":186,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.91],"t":187,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.917],"t":188,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.925],"t":189,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.931],"t":190,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.937],"t":191,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.943],"t":192,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.949],"t":193,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.954],"t":194,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.958],"t":195,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.963],"t":196,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.967],"t":197,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.97],"t":198,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.974],"t":199,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.977],"t":200,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.98],"t":201,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.983],"t":202,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.985],"t":203,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.987],"t":204,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.989],"t":205,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.991],"t":206,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.993],"t":207,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.994],"t":208,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.996],"t":209,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.997],"t":210,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.998],"t":211,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.998],"t":212,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.999],"t":213,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1],"t":215,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.009],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.038],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.093],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.193],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.4],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.636],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.739],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.8],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.84],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.871],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.894],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.912],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.928],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.94],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.951],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.959],"t":266,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.967],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.973],"t":268,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.979],"t":269,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.983],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.987],"t":271,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.99],"t":272,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.993],"t":273,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.995],"t":274,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.997],"t":275,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.998],"t":276,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.999],"t":278,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2],"t":380,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.009],"t":381,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.038],"t":382,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.093],"t":383,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.193],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.4],"t":385,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.636],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.739],"t":387,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.8],"t":388,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.84],"t":389,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.871],"t":390,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.894],"t":391,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.912],"t":392,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.928],"t":393,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.94],"t":394,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.951],"t":395,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.959],"t":396,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.967],"t":397,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.973],"t":398,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.979],"t":399,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.983],"t":400,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.987],"t":401,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.99],"t":402,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.993],"t":403,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.995],"t":404,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.997],"t":405,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[2.999],"t":408,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}}]},{"ty":5,"nm":"Keys","np":3,"mn":"ADBE Slider Control","ix":3,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.831],"y":[0.109]},"o":{"x":[0.458],"y":[0.053]},"t":142,"s":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.15],"y":[0.43]},"t":161,"s":[0.15]},{"t":217,"s":[1],"h":1},{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":250,"s":[1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":255,"s":[1.4]},{"t":280,"s":[2],"h":1},{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":380,"s":[2]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":385,"s":[2.4]},{"t":410,"s":[3]}],"ix":1}}]},{"ty":5,"nm":"State (holds)","np":3,"mn":"ADBE Slider Control","ix":4,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":0,"k":0,"ix":1}}]}],"shapes":[],"ip":0,"op":451,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Null :: Taskbar drop","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[252,278,0],"t":186,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,278.45,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,279.615,0],"t":188,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,281.252,0],"t":189,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,283.166,0],"t":190,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,287.233,0],"t":192,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,289.181,0],"t":193,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,290.982,0],"t":194,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,292.599,0],"t":195,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,294.012,0],"t":196,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,295.216,0],"t":197,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,296.216,0],"t":198,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,297.023,0],"t":199,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,297.655,0],"t":200,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.131,0],"t":201,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.474,0],"t":202,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.705,0],"t":203,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.465,0],"t":212,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.226,0],"t":215,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298,0],"t":377,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298.382,0],"t":378,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,299.372,0],"t":379,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,300.764,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,302.391,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,305.848,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,307.504,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,309.035,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,310.409,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,311.611,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,312.634,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,313.483,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,314.169,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,314.706,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.112,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.403,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.717,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.474,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,315.192,0],"t":406,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"Taskbar Lofi","parent":3,"refId":"comp_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":134,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":143,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":432,"s":[100]},{"t":444,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":0,"ix":3},"y":{"k":[{"s":[26.984],"t":127,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.971],"t":128,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.95],"t":129,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.921],"t":130,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.882],"t":131,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.83],"t":132,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.765],"t":133,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.685],"t":134,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.589],"t":135,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.478],"t":136,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.349],"t":137,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.205],"t":138,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.072],"t":139,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.926],"t":140,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.764],"t":141,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.589],"t":142,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.397],"t":143,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.187],"t":144,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.959],"t":145,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.711],"t":146,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.44],"t":147,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.146],"t":148,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.826],"t":149,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.479],"t":150,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.1],"t":151,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[22.686],"t":152,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[22.236],"t":153,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[21.745],"t":154,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[21.207],"t":155,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[20.616],"t":156,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.967],"t":157,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.248],"t":158,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[18.457],"t":159,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.578],"t":160,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.602],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.514],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.303],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[12.954],"t":164,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[11.477],"t":165,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[9.885],"t":166,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[8.215],"t":167,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[6.526],"t":168,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[4.878],"t":169,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[3.338],"t":170,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.928],"t":171,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0.659],"t":172,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-0.475],"t":173,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-1.485],"t":174,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-2.388],"t":175,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-3.192],"t":176,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-3.911],"t":177,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-4.556],"t":178,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-5.136],"t":179,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-5.662],"t":180,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-6.135],"t":181,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-6.563],"t":182,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-6.951],"t":183,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-7.303],"t":184,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-7.622],"t":185,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-7.913],"t":186,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.175],"t":187,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.413],"t":188,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.628],"t":189,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.823],"t":190,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-8.998],"t":191,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.155],"t":192,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.296],"t":193,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.42],"t":194,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.531],"t":195,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.627],"t":196,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.711],"t":197,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.783],"t":198,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.843],"t":199,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.893],"t":200,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.933],"t":201,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.963],"t":202,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.984],"t":203,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-9.996],"t":204,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}},"a":{"a":0,"k":[91,15,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Super Slider","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.64],"y":[0.48]},"o":{"x":[0.36],"y":[0]},"t":121,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":138,"s":[17.5]},{"t":205,"s":[100]}],"ix":1}}]}],"w":182,"h":30,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":3,"nm":"Focus Task :: Lift & Drop","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":252,"ix":3},"y":{"k":[{"s":[157.385],"t":145,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.28],"t":147,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.128],"t":149,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.026],"t":150,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.901],"t":151,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.75],"t":152,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.564],"t":153,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.335],"t":154,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.054],"t":155,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[155.706],"t":156,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[155.275],"t":157,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[154.73],"t":158,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[154.03],"t":159,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[153.103],"t":160,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[151.8],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[150.035],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[148.047],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.867],"t":164,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[143.589],"t":165,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[141.341],"t":166,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[139.241],"t":167,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[137.346],"t":168,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[135.666],"t":169,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[134.185],"t":170,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[132.878],"t":171,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[131.718],"t":172,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[130.684],"t":173,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[129.755],"t":174,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[128.916],"t":175,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[128.155],"t":176,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[127.462],"t":177,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[126.829],"t":178,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[126.249],"t":179,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[125.715],"t":180,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[125.221],"t":181,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[124.765],"t":182,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[124.343],"t":183,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[123.951],"t":184,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[123.587],"t":185,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[123.249],"t":186,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.934],"t":187,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.641],"t":188,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.369],"t":189,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.114],"t":190,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.877],"t":191,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.657],"t":192,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.452],"t":193,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.26],"t":194,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[121.082],"t":195,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.918],"t":196,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.764],"t":197,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.623],"t":198,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.492],"t":199,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.371],"t":200,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.261],"t":201,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.158],"t":202,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.065],"t":203,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.98],"t":204,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.903],"t":205,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.835],"t":206,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.718],"t":208,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.629],"t":210,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.51],"t":215,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.5],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.746],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.54],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.071],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[124.808],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[130.5],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[136.982],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[139.835],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[141.489],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[142.613],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[143.442],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[144.082],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[144.593],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.01],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.354],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.642],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.884],"t":266,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.089],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.262],"t":268,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.409],"t":269,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.534],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.638],"t":271,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.725],"t":272,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.857],"t":274,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[147],"t":380,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[147.094],"t":381,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[147.397],"t":382,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[147.982],"t":383,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[149.027],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[151.2],"t":385,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[153.675],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[154.764],"t":387,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[155.396],"t":388,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[155.825],"t":389,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.141],"t":390,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.386],"t":391,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.581],"t":392,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.74],"t":393,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.871],"t":394,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[156.981],"t":395,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.074],"t":396,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.218],"t":398,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[157.362],"t":401,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"matte","parent":5,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"k":[{"s":[503.613,314.758],"t":144,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[503.134,314.459],"t":146,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.832,314.27],"t":147,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.464,314.04],"t":148,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.025,313.765],"t":149,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[501.487,313.429],"t":150,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[500.824,313.015],"t":151,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[500.023,312.514],"t":152,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[499.032,311.895],"t":153,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[497.818,311.136],"t":154,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[496.328,310.205],"t":155,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[494.484,309.053],"t":156,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[492.194,307.621],"t":157,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[489.307,305.817],"t":158,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[485.592,303.495],"t":159,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[480.67,300.419],"t":160,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[473.76,296.1],"t":161,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[464.395,290.247],"t":162,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[453.849,283.656],"t":163,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[442.286,276.429],"t":164,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[430.198,268.874],"t":165,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[418.274,261.421],"t":166,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[407.131,254.457],"t":167,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[397.077,248.173],"t":168,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[388.165,242.603],"t":169,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[380.31,237.694],"t":170,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[373.373,233.358],"t":171,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[367.218,229.511],"t":172,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[361.732,226.082],"t":173,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[356.803,223.002],"t":174,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[352.354,220.221],"t":175,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[348.318,217.699],"t":176,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[344.643,215.402],"t":177,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[341.283,213.302],"t":178,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[338.205,211.378],"t":179,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[335.37,209.606],"t":180,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[332.752,207.97],"t":181,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[330.33,206.456],"t":182,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[328.092,205.058],"t":183,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[326.012,203.757],"t":184,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[324.082,202.552],"t":185,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[322.291,201.432],"t":186,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[320.617,200.386],"t":187,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[319.062,199.414],"t":188,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[317.618,198.512],"t":189,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[316.267,197.667],"t":190,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[315.013,196.883],"t":191,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[313.845,196.153],"t":192,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[312.756,195.472],"t":193,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[311.738,194.837],"t":194,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[310.793,194.246],"t":195,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[309.921,193.7],"t":196,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[309.107,193.192],"t":197,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[308.359,192.724],"t":198,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[307.663,192.289],"t":199,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[307.02,191.888],"t":200,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[306.436,191.522],"t":201,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[305.891,191.182],"t":202,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[305.399,190.874],"t":203,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[304.946,190.591],"t":204,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[304.539,190.337],"t":205,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[304.178,190.112],"t":206,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[303.85,189.906],"t":207,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[303.555,189.722],"t":208,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[303.306,189.566],"t":209,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[303.082,189.427],"t":210,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[302.892,189.308],"t":211,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[302.617,189.135],"t":213,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[302.4,189],"t":250,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[302.247,188.904],"t":251,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[301.752,188.595],"t":252,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[300.798,187.999],"t":253,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[299.093,186.933],"t":254,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[295.546,184.716],"t":255,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[291.506,182.192],"t":256,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[289.729,181.08],"t":257,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[288.698,180.436],"t":258,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.998,179.999],"t":259,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.481,179.676],"t":260,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.082,179.427],"t":261,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.764,179.227],"t":262,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.504,179.065],"t":263,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.29,178.931],"t":264,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.11,178.819],"t":265,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.832,178.645],"t":267,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.555,178.472],"t":270,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.272,178.295],"t":278,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.264,178.29],"t":380,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.222,179.514],"t":381,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[293.538,183.461],"t":382,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[305.714,191.071],"t":383,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[327.48,204.675],"t":384,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[372.758,232.974],"t":385,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[424.317,265.198],"t":386,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[447.009,279.381],"t":387,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[460.167,287.605],"t":388,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[469.103,293.19],"t":389,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[475.697,297.31],"t":390,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[480.788,300.492],"t":391,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[484.853,303.033],"t":392,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[488.172,305.107],"t":393,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[490.906,306.816],"t":394,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[493.198,308.249],"t":395,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[495.121,309.451],"t":396,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[496.752,310.47],"t":397,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[498.133,311.333],"t":398,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[499.301,312.063],"t":399,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[500.29,312.681],"t":400,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[501.123,313.202],"t":401,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[501.814,313.634],"t":402,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.391,313.994],"t":403,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[502.861,314.288],"t":404,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[503.238,314.524],"t":405,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[503.53,314.706],"t":406,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}}]},"p":{"a":0,"k":[0,0],"ix":3},"r":{"k":[{"s":[27.974],"t":144,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.959],"t":145,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.942],"t":146,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.922],"t":147,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.898],"t":148,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.869],"t":149,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.833],"t":150,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.789],"t":151,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.736],"t":152,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.67],"t":153,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.589],"t":154,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.49],"t":155,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.368],"t":156,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.216],"t":157,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.024],"t":158,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.777],"t":159,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.45],"t":160,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.991],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.37],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.669],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.901],"t":164,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[23.098],"t":165,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[22.306],"t":166,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[21.566],"t":167,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[20.898],"t":168,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[20.306],"t":169,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.785],"t":170,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.324],"t":171,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[18.915],"t":172,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[18.551],"t":173,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[18.223],"t":174,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.928],"t":175,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.66],"t":176,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.416],"t":177,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[17.193],"t":178,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.988],"t":179,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.8],"t":180,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.626],"t":181,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.465],"t":182,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.316],"t":183,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.178],"t":184,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.05],"t":185,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.931],"t":186,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.82],"t":187,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.717],"t":188,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.621],"t":189,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.531],"t":190,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.448],"t":191,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.37],"t":192,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.298],"t":193,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.23],"t":194,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.167],"t":195,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.11],"t":196,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.055],"t":197,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.006],"t":198,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.96],"t":199,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.917],"t":200,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.878],"t":201,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.842],"t":202,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.809],"t":203,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.779],"t":204,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.752],"t":205,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.728],"t":206,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.706],"t":207,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.687],"t":208,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.67],"t":209,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.655],"t":210,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.643],"t":211,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.633],"t":212,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.624],"t":213,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.61],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.603],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.579],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.532],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.45],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.278],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.082],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.996],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.946],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.912],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.887],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.868],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.853],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.84],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.83],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.821],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.808],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.794],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.78],"t":278,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.78],"t":380,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.907],"t":381,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.318],"t":382,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[15.109],"t":383,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[16.524],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[19.468],"t":385,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[22.82],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[24.295],"t":387,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.15],"t":388,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[25.731],"t":389,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.16],"t":390,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.491],"t":391,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.755],"t":392,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[26.971],"t":393,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.149],"t":394,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.298],"t":395,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.423],"t":396,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.529],"t":397,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.619],"t":398,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.694],"t":399,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.759],"t":400,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.813],"t":401,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.858],"t":402,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.895],"t":403,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.926],"t":404,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.95],"t":405,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.969],"t":406,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[27.993],"t":408,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":0,"nm":"Recents_LofiApp","parent":6,"tt":1,"tp":6,"refId":"comp_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[252,157.5,0],"ix":1,"l":2},"s":{"k":[{"s":[99.923,99.923,100],"t":144,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.828,99.828,100],"t":146,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.768,99.768,100],"t":147,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.695,99.695,100],"t":148,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.608,99.608,100],"t":149,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.501,99.501,100],"t":150,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.37,99.37,100],"t":151,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.211,99.211,100],"t":152,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.014,99.014,100],"t":153,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.773,98.773,100],"t":154,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.478,98.478,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.112,98.112,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.658,97.658,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.085,97.085,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.348,96.348,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.371,95.371,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94,94,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.142,92.142,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.049,90.049,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[87.755,87.755,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.357,85.357,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[82.991,82.991,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.78,80.78,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[78.785,78.785,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[77.017,77.017,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[75.458,75.458,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[74.082,74.082,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[72.861,72.861,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[71.772,71.772,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70.794,70.794,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[69.911,69.911,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[69.111,69.111,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.382,68.382,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[67.715,67.715,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[67.104,67.104,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[66.542,66.542,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[66.022,66.022,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[65.542,65.542,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[65.098,65.098,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[64.685,64.685,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[64.302,64.302,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.947,63.947,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.615,63.615,100],"t":187,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.306,63.306,100],"t":188,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.02,63.02,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[62.751,62.751,100],"t":190,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[62.503,62.503,100],"t":191,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[62.271,62.271,100],"t":192,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[62.055,62.055,100],"t":193,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.853,61.853,100],"t":194,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.665,61.665,100],"t":195,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.492,61.492,100],"t":196,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.331,61.331,100],"t":197,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.182,61.182,100],"t":198,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[61.044,61.044,100],"t":199,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.917,60.917,100],"t":200,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.801,60.801,100],"t":201,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.693,60.693,100],"t":202,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.595,60.595,100],"t":203,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.505,60.505,100],"t":204,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.424,60.424,100],"t":205,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.353,60.353,100],"t":206,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.288,60.288,100],"t":207,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.229,60.229,100],"t":208,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.18,60.18,100],"t":209,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.135,60.135,100],"t":210,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.098,60.098,100],"t":211,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.043,60.043,100],"t":213,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60,60,100],"t":250,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.97,59.97,100],"t":251,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.871,59.871,100],"t":252,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.682,59.682,100],"t":253,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.344,59.344,100],"t":254,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[58.64,58.64,100],"t":255,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.839,57.839,100],"t":256,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.486,57.486,100],"t":257,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.281,57.281,100],"t":258,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.142,57.142,100],"t":259,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.04,57.04,100],"t":260,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.961,56.961,100],"t":261,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.898,56.898,100],"t":262,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.846,56.846,100],"t":263,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.804,56.804,100],"t":264,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.768,56.768,100],"t":265,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.713,56.713,100],"t":267,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.658,56.658,100],"t":270,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.602,56.602,100],"t":278,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.6,56.6,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.989,56.989,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[58.242,58.242,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.657,60.657,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[64.976,64.976,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[73.96,73.96,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[84.19,84.19,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.692,88.692,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[91.303,91.303,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.076,93.076,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.384,94.384,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.394,95.394,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.201,96.201,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.859,96.859,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.402,97.402,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.857,97.857,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.238,98.238,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.562,98.562,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.836,98.836,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.068,99.068,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.264,99.264,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.429,99.429,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.566,99.566,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.681,99.681,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.774,99.774,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.849,99.849,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.907,99.907,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"w":504,"h":315,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":7,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"t":277,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,-30.035,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[176.678,176.678,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"second Tasks Zoom back","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.8,0.8,0.8],"y":[0.15,0.15,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":380,"s":[100,100,100]},{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0.7,0.7,0]},"t":385,"s":[98,98,100]},{"t":410,"s":[95,95,100]}],"ix":6,"l":2}},"ao":0,"shapes":[],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Null :: Reposition Side Task","parent":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.8,"y":0.15},"o":{"x":0.3,"y":0},"t":250,"s":[-318.4,-38,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.7},"t":255,"s":[-277.34,-48.1,0],"to":[0,0,0],"ti":[0,0,0]},{"t":280,"s":[-215.75,-63.25,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":12,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":277,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-111.72,0],"t":250,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-111.197,0],"t":251,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-109.514,0],"t":252,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-106.268,0],"t":253,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-100.462,0],"t":254,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-88.39,0],"t":255,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-74.643,0],"t":256,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-68.591,0],"t":257,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-65.083,0],"t":258,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-62.7,0],"t":259,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-60.943,0],"t":260,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-59.584,0],"t":261,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-58.5,0],"t":262,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-57.616,0],"t":263,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-56.886,0],"t":264,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-56.276,0],"t":265,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-55.762,0],"t":266,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-55.328,0],"t":267,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.96,0],"t":268,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.648,0],"t":269,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.385,0],"t":270,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.163,0],"t":271,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.977,0],"t":272,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.824,0],"t":273,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.698,0],"t":274,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.598,0],"t":275,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.521,0],"t":276,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.463,0],"t":277,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.424,0],"t":278,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":10,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.963},"t":217,"s":[-84.8,0,0],"to":[0,0,0],"ti":[0,0,0]},{"t":250,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.8,0.8],"y":[0.15,0.15]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":250,"s":[302.4,189]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0.7]},"t":255,"s":[227.56,142.34]},{"t":280,"s":[115.3,72.35]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":250,"s":[14.6]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":255,"s":[14.272]},{"t":280,"s":[13.78]}],"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":14,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":277,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-53.175,0],"t":197,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.175,0],"t":510,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.8,"y":0.15},"o":{"x":0.3,"y":0},"t":250,"s":[-411.95,20.325,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.7},"t":255,"s":[-333.47,29.183,0],"to":[0,0,0],"ti":[0,0,0]},{"t":280,"s":[-215.75,42.47,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[115.3,72.35],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":13.78,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0}]},{"id":"comp_1","nm":"Taskbar Lofi","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[51.5,0,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.652,0,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.136,0,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[53.013,0,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.449,0,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.806,0,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[61.3,0,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[66.437,0,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[68.94,0,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[70.432,0,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[71.462,0,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[72.229,0,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[72.83,0,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[73.314,0,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[73.714,0,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.048,0,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.334,0,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.578,0,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.789,0,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[74.971,0,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.131,0,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.269,0,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.389,0,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.493,0,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.584,0,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.663,0,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.731,0,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.789,0,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.839,0,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.915,0,0],"t":185,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.982,0,0],"t":188,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[76,0,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.779,0,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[75.066,0,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[73.709,0,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[71.271,0,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[66.2,0,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[60.425,0,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.886,0,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.41,0,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.409,0,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.67,0,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[54.1,0,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[53.646,0,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[53.275,0,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.968,0,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.711,0,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.495,0,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.312,0,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.157,0,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[52.026,0,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.916,0,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.822,0,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.745,0,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.68,0,0],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.628,0,0],"t":404,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.585,0,0],"t":405,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.552,0,0],"t":406,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[51.501,0,0],"t":409,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[167,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7511","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[167,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 5","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[123.341,15,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.654,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.223,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[125.146,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[126.662,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[129.549,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[132.838,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[134.455,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[135.421,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[136.083,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[136.576,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[136.962,15,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.272,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.528,15,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.742,15,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.924,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.08,15,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.216,15,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.334,15,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.437,15,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.527,15,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.606,15,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.734,15,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.869,15,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.864,15,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[138.402,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[137.527,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[135.96,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[132.701,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[129.002,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[127.358,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[126.406,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[125.763,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[125.288,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.923,15,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.633,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.396,15,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.199,15,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[124.034,15,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.895,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.776,15,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.675,15,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.589,15,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.516,15,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.403,15,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[123.299,15,0],"t":405,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[139,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7508","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[139,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 4","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[104.041,15,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.182,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.436,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.844,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[105.517,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[106.808,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[108.265,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[108.981,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[109.409,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[109.703,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[109.923,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.092,15,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.228,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.341,15,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.436,15,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.517,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.587,15,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.648,15,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.746,15,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.853,15,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.956,15,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.938,15,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.73,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[110.34,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[109.649,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[108.197,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[106.559,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[105.828,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[105.403,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[105.117,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.906,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.745,15,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.616,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.511,15,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.424,15,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.35,15,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.288,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.19,15,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[104.091,15,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[111,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7507","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[111,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 3","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[84.704,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.639,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.537,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.371,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.048,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.684,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.505,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.398,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.324,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.271,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.195,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.123,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.045,15,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.068,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.166,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.338,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83.702,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.112,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.294,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.399,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.47,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.521,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.593,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[84.676,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[83,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7506","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[83,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 2","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[65.439,15,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.229,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.849,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.236,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[63.226,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[61.296,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[59.111,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[58.033,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.388,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.945,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.616,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.359,15,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[56.154,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.984,15,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.842,15,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.72,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.616,15,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.525,15,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.447,15,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.378,15,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.317,15,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.265,15,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.219,15,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.178,15,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.143,15,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.113,15,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.066,15,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.012,15,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55,15,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.092,15,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.403,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55.986,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[57.027,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[59.212,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[61.67,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[62.762,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[63.396,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[63.825,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.141,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.385,15,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.578,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.736,15,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.867,15,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[64.977,15,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.07,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.149,15,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.217,15,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.274,15,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.323,15,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.364,15,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.426,15,0],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[65.491,15,0],"t":407,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[55,15,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7505","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[55,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":90,"ix":10},"p":{"k":[{"s":[51,15,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.913,15,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.615,15,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.073,15,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.194,15,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[47.751,15,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[45.001,15,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[41.869,15,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[40.328,15,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[39.409,15,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.778,15,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.309,15,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.941,15,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.645,15,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.402,15,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.199,15,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.025,15,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.876,15,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.747,15,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.635,15,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.536,15,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.451,15,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.376,15,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.31,15,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.253,15,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.203,15,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.161,15,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.124,15,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.093,15,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.068,15,0],"t":184,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.047,15,0],"t":185,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.017,15,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36,15,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.129,15,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36.569,15,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[37.403,15,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[38.895,15,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[41.999,15,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[45.522,15,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[47.088,15,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[47.994,15,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[48.607,15,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.059,15,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.407,15,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.683,15,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[49.909,15,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.096,15,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.253,15,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.386,15,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.499,15,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.596,15,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.677,15,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.747,15,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.806,15,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.854,15,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.895,15,0],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.927,15,0],"t":404,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[50.973,15,0],"t":406,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"k":[{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2,-0.5],[2,-0.5]],"c":false}],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.019,-0.5],[2.019,-0.5]],"c":false}],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.077,-0.5],[2.077,-0.5]],"c":false}],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.185,-0.5],[2.185,-0.5]],"c":false}],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.361,-0.5],[2.361,-0.5]],"c":false}],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.65,-0.5],[2.65,-0.5]],"c":false}],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.2,-0.5],[3.2,-0.5]],"c":false}],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.829,-0.5],[3.829,-0.5]],"c":false}],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.136,-0.5],[4.136,-0.5]],"c":false}],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.318,-0.5],[4.318,-0.5]],"c":false}],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.444,-0.5],[4.444,-0.5]],"c":false}],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.538,-0.5],[4.538,-0.5]],"c":false}],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.612,-0.5],[4.612,-0.5]],"c":false}],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.671,-0.5],[4.671,-0.5]],"c":false}],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.72,-0.5],[4.72,-0.5]],"c":false}],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.761,-0.5],[4.761,-0.5]],"c":false}],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.796,-0.5],[4.796,-0.5]],"c":false}],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.826,-0.5],[4.826,-0.5]],"c":false}],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.852,-0.5],[4.852,-0.5]],"c":false}],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.874,-0.5],[4.874,-0.5]],"c":false}],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.894,-0.5],[4.894,-0.5]],"c":false}],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.91,-0.5],[4.91,-0.5]],"c":false}],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.925,-0.5],[4.925,-0.5]],"c":false}],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.938,-0.5],[4.938,-0.5]],"c":false}],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.949,-0.5],[4.949,-0.5]],"c":false}],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.959,-0.5],[4.959,-0.5]],"c":false}],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.967,-0.5],[4.967,-0.5]],"c":false}],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.974,-0.5],[4.974,-0.5]],"c":false}],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.98,-0.5],[4.98,-0.5]],"c":false}],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.99,-0.5],[4.99,-0.5]],"c":false}],"t":185,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.996,-0.5],[4.996,-0.5]],"c":false}],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,-0.5],[5,-0.5]],"c":false}],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.973,-0.5],[4.973,-0.5]],"c":false}],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.887,-0.5],[4.887,-0.5]],"c":false}],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.72,-0.5],[4.72,-0.5]],"c":false}],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-4.421,-0.5],[4.421,-0.5]],"c":false}],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.8,-0.5],[3.8,-0.5]],"c":false}],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-3.093,-0.5],[3.093,-0.5]],"c":false}],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.782,-0.5],[2.782,-0.5]],"c":false}],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.601,-0.5],[2.601,-0.5]],"c":false}],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.479,-0.5],[2.479,-0.5]],"c":false}],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.388,-0.5],[2.388,-0.5]],"c":false}],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.318,-0.5],[2.318,-0.5]],"c":false}],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.263,-0.5],[2.263,-0.5]],"c":false}],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.217,-0.5],[2.217,-0.5]],"c":false}],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.18,-0.5],[2.18,-0.5]],"c":false}],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.148,-0.5],[2.148,-0.5]],"c":false}],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.122,-0.5],[2.122,-0.5]],"c":false}],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.099,-0.5],[2.099,-0.5]],"c":false}],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.081,-0.5],[2.081,-0.5]],"c":false}],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.064,-0.5],[2.064,-0.5]],"c":false}],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.051,-0.5],[2.051,-0.5]],"c":false}],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.039,-0.5],[2.039,-0.5]],"c":false}],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.03,-0.5],[2.03,-0.5]],"c":false}],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.022,-0.5],[2.022,-0.5]],"c":false}],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.01,-0.5],[2.01,-0.5]],"c":false}],"t":405,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.006,-0.5],[2.006,-0.5]],"c":false}],"t":406,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.004,-0.5],[2.004,-0.5]],"c":false}],"t":407,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-2.001,-0.5],[2.001,-0.5]],"c":false}],"t":408,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}]},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"divider","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"k":[{"s":[0],"t":161,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[54.85],"t":162,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":163,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":384,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[0],"t":386,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[-52.349,0.652,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.453,0.652,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.813,0.652,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.464,0.652,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.515,0.652,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-56.247,0.652,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-59.565,0.652,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-63.323,0.652,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-65.162,0.652,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-66.258,0.652,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-67.015,0.652,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-67.578,0.652,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.019,0.652,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.375,0.652,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.668,0.652,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.914,0.652,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.122,0.652,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.301,0.652,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.456,0.652,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.59,0.652,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.708,0.652,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.81,0.652,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.9,0.652,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.978,0.652,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.047,0.652,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.106,0.652,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.157,0.652,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.2,0.652,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.268,0.652,0],"t":184,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.328,0.652,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.349,0.652,0],"t":380,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.193,0.652,0],"t":381,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-69.662,0.652,0],"t":382,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-68.662,0.652,0],"t":383,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-66.874,0.652,0],"t":384,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-63.132,0.652,0],"t":385,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-58.906,0.652,0],"t":386,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-57.04,0.652,0],"t":387,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.956,0.652,0],"t":388,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-55.22,0.652,0],"t":389,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.678,0.652,0],"t":390,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-54.259,0.652,0],"t":391,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.925,0.652,0],"t":392,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.654,0.652,0],"t":393,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.43,0.652,0],"t":394,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.241,0.652,0],"t":395,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-53.082,0.652,0],"t":396,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.947,0.652,0],"t":397,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.831,0.652,0],"t":398,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.734,0.652,0],"t":399,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.65,0.652,0],"t":400,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.58,0.652,0],"t":401,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.522,0.652,0],"t":402,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.474,0.652,0],"t":403,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.435,0.652,0],"t":404,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.404,0.652,0],"t":405,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-52.354,0.652,0],"t":408,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[6.826,6.826,0],"ix":1,"l":2},"s":{"k":[{"s":[50,50,100],"t":155,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.309,50.309,100],"t":156,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.284,51.284,100],"t":157,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.079,53.079,100],"t":158,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.019,56.019,100],"t":159,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.828,60.828,100],"t":160,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[70,70,100],"t":161,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80.485,80.485,100],"t":162,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[85.597,85.597,100],"t":163,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[88.641,88.641,100],"t":164,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.739,90.739,100],"t":165,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[92.305,92.305,100],"t":166,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[93.53,93.53,100],"t":167,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[94.518,94.518,100],"t":168,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.335,95.335,100],"t":169,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.021,96.021,100],"t":170,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[96.603,96.603,100],"t":171,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.101,97.101,100],"t":172,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.531,97.531,100],"t":173,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[97.902,97.902,100],"t":174,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.226,98.226,100],"t":175,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.507,98.507,100],"t":176,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.753,98.753,100],"t":177,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.966,98.966,100],"t":178,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.152,99.152,100],"t":179,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.313,99.313,100],"t":180,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.451,99.451,100],"t":181,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.57,99.57,100],"t":182,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.671,99.671,100],"t":183,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.756,99.756,100],"t":184,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.826,99.826,100],"t":185,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.883,99.883,100],"t":186,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.982,99.982,100],"t":189,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":380,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[99.552,99.552,100],"t":381,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[98.109,98.109,100],"t":382,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[95.326,95.326,100],"t":383,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[90.35,90.35,100],"t":384,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[80,80,100],"t":385,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[68.215,68.215,100],"t":386,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[63.027,63.027,100],"t":387,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[60.02,60.02,100],"t":388,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.977,57.977,100],"t":389,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.47,56.47,100],"t":390,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[55.306,55.306,100],"t":391,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[54.377,54.377,100],"t":392,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[53.618,53.618,100],"t":393,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.993,52.993,100],"t":394,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.469,52.469,100],"t":395,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[52.03,52.03,100],"t":396,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.657,51.657,100],"t":397,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.341,51.341,100],"t":398,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[51.074,51.074,100],"t":399,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.848,50.848,100],"t":400,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.658,50.658,100],"t":401,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.5,50.5,100],"t":402,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.368,50.368,100],"t":403,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.26,50.26,100],"t":404,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.174,50.174,100],"t":405,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.107,50.107,100],"t":406,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.059,50.059,100],"t":407,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[50.024,50.024,100],"t":408,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 12","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,9.501],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 12","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 11","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,2.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 11","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[9.5,2.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.185,0.148],[0,0],[0,0],[0,0],[-0.086,0.24],[0,0.271],[0.468,0.462],[0.671,0],[0.468,-0.468],[0,-0.671],[-0.462,-0.468],[-0.671,0],[-0.24,0.086]],"o":[[0,0],[0,0],[0,0],[0.148,-0.185],[0.086,-0.24],[0,-0.671],[-0.462,-0.468],[-0.671,0],[-0.462,0.462],[0,0.671],[0.468,0.462],[0.271,0],[0.24,-0.086]],"v":[[0.48,0.998],[2.809,3.326],[3.326,2.809],[0.998,0.48],[1.349,-0.157],[1.478,-0.924],[0.776,-2.624],[-0.924,-3.326],[-2.633,-2.624],[-3.326,-0.924],[-2.633,0.785],[-0.924,1.478],[-0.157,1.349]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":5,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.326,-0.326],[0.462,0],[0.326,0.32],[0,0.462],[-0.32,0.32],[-0.462,0],[-0.32,-0.326],[0,-0.462]],"o":[[-0.32,0.32],[-0.462,0],[-0.32,-0.326],[0,-0.462],[0.326,-0.326],[0.462,0],[0.326,0.32],[0,0.462]],"v":[[0.249,0.259],[-0.924,0.739],[-2.106,0.259],[-2.587,-0.924],[-2.106,-2.097],[-0.924,-2.587],[0.249,-2.097],[0.739,-0.924]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":5,"nm":"Merge Paths 2","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"st","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0.4,"ix":5},"lc":1,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"icon","np":6,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[10.326,10.326],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"icon","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[91,15,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"k":[{"s":[120,4],"t":155,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.383,4.161],"t":156,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[121.592,4.668],"t":157,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[123.818,5.601],"t":158,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[127.463,7.13],"t":159,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[133.427,9.631],"t":160,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[144.8,14.4],"t":161,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[157.801,19.852],"t":162,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[164.141,22.511],"t":163,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[167.915,24.093],"t":164,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[170.516,25.184],"t":165,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[172.458,25.999],"t":166,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[173.978,26.636],"t":167,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[175.203,27.15],"t":168,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[176.216,27.574],"t":169,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[177.065,27.931],"t":170,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[177.788,28.234],"t":171,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[178.406,28.493],"t":172,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[178.938,28.716],"t":173,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[179.399,28.909],"t":174,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[179.8,29.078],"t":175,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[180.149,29.224],"t":176,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[180.454,29.352],"t":177,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[180.718,29.463],"t":178,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[180.949,29.559],"t":179,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.148,29.643],"t":180,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.32,29.715],"t":181,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.467,29.777],"t":182,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.592,29.829],"t":183,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.697,29.873],"t":184,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.784,29.91],"t":185,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.855,29.939],"t":186,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.909,29.962],"t":187,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.978,29.991],"t":189,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[182,30],"t":380,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[181.445,29.767],"t":381,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[179.655,29.017],"t":382,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[176.204,27.569],"t":383,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[170.034,24.982],"t":384,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[157.2,19.6],"t":385,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[142.586,13.472],"t":386,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[136.154,10.774],"t":387,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[132.424,9.21],"t":388,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[129.891,8.148],"t":389,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[128.022,7.364],"t":390,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[126.579,6.759],"t":391,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[125.427,6.276],"t":392,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[124.487,5.881],"t":393,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[123.712,5.556],"t":394,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[123.062,5.284],"t":395,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[122.517,5.055],"t":396,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[122.055,4.862],"t":397,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[121.663,4.697],"t":398,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[121.332,4.559],"t":399,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[121.051,4.441],"t":400,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.815,4.342],"t":401,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.62,4.26],"t":402,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.456,4.191],"t":403,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.323,4.135],"t":404,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.216,4.091],"t":405,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.133,4.056],"t":406,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.073,4.03],"t":407,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.03,4.013],"t":408,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[120.008,4.003],"t":409,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}}]},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":32.672,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Taskbar Lofi","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]},{"id":"comp_2","nm":"Recents_LofiApp","fr":60,"pfr":1,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[339.937,151.75,0],"ix":2,"l":2},"a":{"a":0,"k":[339.937,151.75,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.021,-1.766],[0,0],[-2.043,0],[0,0],[1.022,1.767]],"o":[[-1.021,-1.766],[0,0],[-1.022,1.767],[0,0],[2.043,0],[0,0]],"v":[[2.297,-7.675],[-2.297,-7.675],[-9.64,5.025],[-7.343,9],[7.343,9],[9.64,5.025]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"rd","nm":"Round Corners 1","r":{"a":0,"k":9,"ix":1},"ix":2,"mn":"ADBE Vector Filter - RC","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Triangle","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[481.874,21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Triangle","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[457.874,21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[292,25],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Text field","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[334,279],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Text field","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[109,28],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[425.5,208.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[160,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":14,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[400,158.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":1,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[126,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":14,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Received","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[251,78.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Received","np":1,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[334,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[340,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":16,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Message","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82,171.125,0],"ix":2,"l":2},"a":{"a":0,"k":[82,171.125,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,177.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 4","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,165.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 3","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,171.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 2","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82.5,140.5,0],"ix":2,"l":2},"a":{"a":0,"k":[82,140.938,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[132,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Search","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[82,31.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"header","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,257.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 6","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,245.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 5","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,251.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 3","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[132,64],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Message","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[82,171],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"block","np":1,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,96.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":1,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,84.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":1,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,90.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 1","np":1,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app only","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","parent":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":37,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":47,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":250,"s":[100]},{"t":256,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,29.984,0],"t":127,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.965,0],"t":128,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.936,0],"t":129,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.894,0],"t":130,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.84,0],"t":131,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.77,0],"t":132,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.682,0],"t":133,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.574,0],"t":134,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.445,0],"t":135,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.294,0],"t":136,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,29.121,0],"t":137,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.925,0],"t":138,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.746,0],"t":139,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.548,0],"t":140,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.33,0],"t":141,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,28.092,0],"t":142,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,27.832,0],"t":143,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,27.548,0],"t":144,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,27.239,0],"t":145,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,26.903,0],"t":146,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,26.536,0],"t":147,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,26.14,0],"t":148,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,25.709,0],"t":149,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,25.241,0],"t":150,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,24.73,0],"t":151,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,24.171,0],"t":152,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,23.563,0],"t":153,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,22.898,0],"t":154,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,22.171,0],"t":155,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,21.373,0],"t":156,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,20.496,0],"t":157,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,19.524,0],"t":158,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,18.451,0],"t":159,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,17.263,0],"t":160,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,15.943,0],"t":161,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,14.475,0],"t":162,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,12.841,0],"t":163,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,11.018,0],"t":164,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,9.023,0],"t":165,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,6.87,0],"t":166,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,4.614,0],"t":167,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,2.333,0],"t":168,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,0.106,0],"t":169,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-1.975,0],"t":170,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-3.877,0],"t":171,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-5.591,0],"t":172,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-7.125,0],"t":173,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-8.492,0],"t":174,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-9.714,0],"t":175,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-10.799,0],"t":176,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-11.771,0],"t":177,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-12.643,0],"t":178,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-13.428,0],"t":179,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-14.138,0],"t":180,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-14.777,0],"t":181,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-15.355,0],"t":182,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-15.879,0],"t":183,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-16.354,0],"t":184,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-16.784,0],"t":185,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-17.177,0],"t":186,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-17.532,0],"t":187,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-17.854,0],"t":188,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-18.146,0],"t":189,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-18.409,0],"t":190,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-18.645,0],"t":191,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-18.858,0],"t":192,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.048,0],"t":193,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.217,0],"t":194,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.366,0],"t":195,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.496,0],"t":196,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.61,0],"t":197,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.707,0],"t":198,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.788,0],"t":199,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.856,0],"t":200,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.911,0],"t":201,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.954,0],"t":202,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-19.984,0],"t":203,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Super Slider","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.64],"y":[0.48]},"o":{"x":[0.36],"y":[0]},"t":121,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":138,"s":[17.5]},{"t":205,"s":[100]}],"ix":1}}]}],"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":62,"s":[41,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":0.56},"o":{"x":0.44,"y":0.44},"t":72,"s":[33,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":248,"s":[33,0],"to":[0,0],"ti":[0,0]},{"t":258,"s":[41,0]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"right circle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":62,"s":[-41,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":0.56},"o":{"x":0.44,"y":0.44},"t":72,"s":[-33,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":248,"s":[-33,0],"to":[0,0],"ti":[0,0]},{"t":258,"s":[-41,0]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"left circle","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"size","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":37,"op":345,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,459,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[200,128],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":18,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Frame 1321317559","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"matte","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Recents_EDU Loop","parent":5,"tt":1,"tp":5,"refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[252,157.5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":504,"h":315,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980401039,0.768627464771,0.627451002598,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"op","nm":"Stroke align: Outside","a":{"k":[{"s":[7],"t":0,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[7],"t":511,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"frame","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}],"markers":[{"tm":142,"cm":"drag with gesture","dr":108},{"tm":217,"cm":"onPause","dr":0},{"tm":250,"cm":"release playback realtime","dr":36}],"props":{}}
\ No newline at end of file diff --git a/packages/SystemUI/res/raw/trackpad_recent_apps_success.json b/packages/SystemUI/res/raw/trackpad_recent_apps_success.json index 1703c41df33a..21a9e135ce8c 100644 --- a/packages/SystemUI/res/raw/trackpad_recent_apps_success.json +++ b/packages/SystemUI/res/raw/trackpad_recent_apps_success.json @@ -1 +1 @@ -{"v":"5.12.1","fr":60,"ip":0,"op":97,"w":554,"h":564,"nm":"Trackpad-JSON_Recents-Success","ddd":0,"assets":[{"id":"comp_0","nm":"TrackpadAK_Success_Checkmark","fr":60,"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Check Rotate","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":2,"s":[-16]},{"t":20,"s":[6]}],"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[95.049,95.049,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":228,"st":-72,"bm":0},{"ddd":0,"ind":2,"ty":3,"nm":"Bounce","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":12,"s":[0]},{"t":36,"s":[-6]}],"ix":10},"p":{"a":0,"k":[81,127,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.263,0.263,0.833],"y":[1.126,1.126,1]},"o":{"x":[0.05,0.05,0.05],"y":[0.958,0.958,0]},"t":1,"s":[80,80,100]},{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.45,0.45,0.167],"y":[0.325,0.325,0]},"t":20,"s":[105,105,100]},{"t":36,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-0.289,"ix":10},"p":{"a":0,"k":[14.364,-33.591,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.125,0,0],"ix":1,"l":2},"s":{"a":0,"k":[104.744,104.744,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.401,-0.007],[-10.033,11.235]],"o":[[5.954,7.288],[1.401,0.007],[0,0]],"v":[[-28.591,4.149],[-10.73,26.013],[31.482,-21.255]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":3,"s":[0]},{"i":{"x":[0.22],"y":[1]},"o":{"x":[0.001],"y":[0.149]},"t":10,"s":[29]},{"t":27,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":11,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":5,"op":44,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[95,95,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.275,0.275,0.21],"y":[1.102,1.102,1]},"o":{"x":[0.037,0.037,0.05],"y":[0.476,0.476,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.252,0.252,0.47],"y":[0.159,0.159,0]},"t":16,"s":[120,120,100]},{"t":28,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.32,0.32],"y":[0.11,0.11]},"t":16,"s":[148,148]},{"t":28,"s":[136,136]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":88,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Checkbox - Widget","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]},{"id":"comp_1","nm":"Trackpad-JSON_Recents-EDU","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","parent":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":37,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":47,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":250,"s":[100]},{"t":256,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-20,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-20,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Super Slider","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.64],"y":[0.48]},"o":{"x":[0.36],"y":[0]},"t":121,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":138,"s":[17.5]},{"t":205,"s":[100]}],"ix":1}}]}],"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":62,"s":[41,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":0.56},"o":{"x":0.44,"y":0.44},"t":72,"s":[33,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":248,"s":[33,0],"to":[0,0],"ti":[0,0]},{"t":258,"s":[41,0]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"right circle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":62,"s":[-41,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":0.56},"o":{"x":0.44,"y":0.44},"t":72,"s":[-33,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":248,"s":[-33,0],"to":[0,0],"ti":[0,0]},{"t":258,"s":[-41,0]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"left circle","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"size","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":37,"op":345,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,459,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[200,128],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":18,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Frame 1321317559","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"matte","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Recents_EDU Loop","parent":5,"tt":1,"tp":5,"refId":"comp_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[252,157.5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":504,"h":315,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980401039,0.768627464771,0.627451002598,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"op","nm":"Stroke align: Outside","a":{"k":[{"s":[7],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[7],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"frame","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]},{"id":"comp_2","nm":"Recents_EDU Loop","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"CNTL || playback","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":0,"ix":3},"y":{"a":0,"k":0,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Picker","np":3,"mn":"Pseudo/@@WcSiov6sT3a4/s0XPKYEOQ","ix":1,"en":1,"ef":[{"ty":7,"nm":"Menu","mn":"Pseudo/@@WcSiov6sT3a4/s0XPKYEOQ-0001","ix":1,"v":{"a":0,"k":2,"ix":1}}]},{"ty":5,"nm":"OUTPUT","np":3,"mn":"ADBE Slider Control","ix":2,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"k":[{"s":[1],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.009],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.038],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.093],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.193],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.4],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.636],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.739],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.8],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.84],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.871],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.894],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.912],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.928],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.94],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.951],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.959],"t":266,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.967],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.973],"t":268,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.979],"t":269,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.983],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.987],"t":271,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.99],"t":272,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.993],"t":273,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.995],"t":274,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.997],"t":275,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.998],"t":276,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.999],"t":278,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}}]},{"ty":5,"nm":"Keys","np":3,"mn":"ADBE Slider Control","ix":3,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.831],"y":[0.109]},"o":{"x":[0.458],"y":[0.053]},"t":142,"s":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.15],"y":[0.43]},"t":161,"s":[0.15]},{"t":217,"s":[1],"h":1},{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":250,"s":[1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":255,"s":[1.4]},{"t":280,"s":[2],"h":1},{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":380,"s":[2]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":385,"s":[2.4]},{"t":410,"s":[3]}],"ix":1}}]},{"ty":5,"nm":"State (holds)","np":3,"mn":"ADBE Slider Control","ix":4,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":0,"k":0,"ix":1}}]}],"shapes":[],"ip":0,"op":451,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Null :: Taskbar drop","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[252,298.112,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"Taskbar Lofi","parent":3,"refId":"comp_3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":134,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":143,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":432,"s":[100]},{"t":444,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":0,"ix":3},"y":{"k":[{"s":[-10],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-10],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}},"a":{"a":0,"k":[91,15,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Super Slider","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.64],"y":[0.48]},"o":{"x":[0.36],"y":[0]},"t":121,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":138,"s":[17.5]},{"t":205,"s":[100]}],"ix":1}}]}],"w":182,"h":30,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":3,"nm":"Focus Task :: Lift & Drop","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":252,"ix":3},"y":{"k":[{"s":[119.5],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.746],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.54],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.071],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[124.808],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[130.5],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[136.982],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[139.835],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[141.489],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[142.613],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[143.442],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[144.082],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[144.593],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.01],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.354],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.642],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.884],"t":266,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.089],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.262],"t":268,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.409],"t":269,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.534],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.638],"t":271,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.725],"t":272,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.857],"t":274,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"matte","parent":5,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"k":[{"s":[302.247,188.904],"t":251,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[301.752,188.595],"t":252,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[300.798,187.999],"t":253,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[299.093,186.933],"t":254,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[295.546,184.716],"t":255,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[291.506,182.192],"t":256,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[289.729,181.08],"t":257,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[288.698,180.436],"t":258,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.998,179.999],"t":259,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.481,179.676],"t":260,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.082,179.427],"t":261,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.764,179.227],"t":262,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.504,179.065],"t":263,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.29,178.931],"t":264,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.11,178.819],"t":265,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.832,178.645],"t":267,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.555,178.472],"t":270,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.272,178.295],"t":278,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}}]},"p":{"a":0,"k":[0,0],"ix":3},"r":{"k":[{"s":[14.603],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.579],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.532],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.45],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.278],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.082],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.996],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.946],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.912],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.887],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.868],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.853],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.84],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.83],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.821],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.808],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.794],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.78],"t":278,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":0,"nm":"Recents_LofiApp","parent":6,"tt":1,"tp":6,"refId":"comp_4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[252,157.5,0],"ix":1,"l":2},"s":{"k":[{"s":[59.97,59.97,100],"t":251,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.871,59.871,100],"t":252,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.682,59.682,100],"t":253,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.344,59.344,100],"t":254,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[58.64,58.64,100],"t":255,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.839,57.839,100],"t":256,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.486,57.486,100],"t":257,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.281,57.281,100],"t":258,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.142,57.142,100],"t":259,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.04,57.04,100],"t":260,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.961,56.961,100],"t":261,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.898,56.898,100],"t":262,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.846,56.846,100],"t":263,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.804,56.804,100],"t":264,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.768,56.768,100],"t":265,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.713,56.713,100],"t":267,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.658,56.658,100],"t":270,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.602,56.602,100],"t":278,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"w":504,"h":315,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":7,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"t":277,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,-30.035,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[176.678,176.678,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"second Tasks Zoom back","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.8,0.8,0.8],"y":[0.15,0.15,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":380,"s":[100,100,100]},{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0.7,0.7,0]},"t":385,"s":[98,98,100]},{"t":410,"s":[95,95,100]}],"ix":6,"l":2}},"ao":0,"shapes":[],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Null :: Reposition Side Task","parent":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.8,"y":0.15},"o":{"x":0.3,"y":0},"t":250,"s":[-318.4,-38,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.7},"t":255,"s":[-277.34,-48.1,0],"to":[0,0,0],"ti":[0,0,0]},{"t":280,"s":[-215.75,-63.25,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":12,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":277,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-111.72,0],"t":250,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-111.197,0],"t":251,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-109.514,0],"t":252,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-106.268,0],"t":253,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-100.462,0],"t":254,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-88.39,0],"t":255,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-74.643,0],"t":256,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-68.591,0],"t":257,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-65.083,0],"t":258,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-62.7,0],"t":259,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-60.943,0],"t":260,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-59.584,0],"t":261,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-58.5,0],"t":262,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-57.616,0],"t":263,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-56.886,0],"t":264,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-56.276,0],"t":265,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-55.762,0],"t":266,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-55.328,0],"t":267,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.96,0],"t":268,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.648,0],"t":269,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.385,0],"t":270,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.163,0],"t":271,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.977,0],"t":272,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.824,0],"t":273,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.698,0],"t":274,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.598,0],"t":275,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.521,0],"t":276,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.463,0],"t":277,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.424,0],"t":278,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":10,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.963},"t":217,"s":[-84.8,0,0],"to":[0,0,0],"ti":[0,0,0]},{"t":250,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.8,0.8],"y":[0.15,0.15]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":250,"s":[302.4,189]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0.7]},"t":255,"s":[227.56,142.34]},{"t":280,"s":[115.3,72.35]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":250,"s":[14.6]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":255,"s":[14.272]},{"t":280,"s":[13.78]}],"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":14,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":277,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-53.175,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.175,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.8,"y":0.15},"o":{"x":0.3,"y":0},"t":250,"s":[-411.95,20.325,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.7},"t":255,"s":[-333.47,29.183,0],"to":[0,0,0],"ti":[0,0,0]},{"t":280,"s":[-215.75,42.47,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[115.3,72.35],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":13.78,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0}]},{"id":"comp_3","nm":"Taskbar Lofi","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"app - 5","parent":9,"sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[76,0,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[76,0,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[167,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7511","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[167,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 5","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"app - 4","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[139,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[139,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[139,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7508","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[139,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 4","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"app - 3","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[111,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[111,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[111,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7507","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[111,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 3","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"app - 2","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[83,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[83,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7506","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[83,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 2","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"app - 1","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[55,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[55,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7505","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[55,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"divider","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":90,"ix":10},"p":{"k":[{"s":[36,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"k":[{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,-0.5],[5,-0.5]],"c":false}],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,-0.5],[5,-0.5]],"c":false}],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}]},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"divider","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[-70.349,0.652,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.349,0.652,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[6.826,6.826,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 12","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,9.501],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 12","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 11","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,2.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 11","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[9.5,2.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.185,0.148],[0,0],[0,0],[0,0],[-0.086,0.24],[0,0.271],[0.468,0.462],[0.671,0],[0.468,-0.468],[0,-0.671],[-0.462,-0.468],[-0.671,0],[-0.24,0.086]],"o":[[0,0],[0,0],[0,0],[0.148,-0.185],[0.086,-0.24],[0,-0.671],[-0.462,-0.468],[-0.671,0],[-0.462,0.462],[0,0.671],[0.468,0.462],[0.271,0],[0.24,-0.086]],"v":[[0.48,0.998],[2.809,3.326],[3.326,2.809],[0.998,0.48],[1.349,-0.157],[1.478,-0.924],[0.776,-2.624],[-0.924,-3.326],[-2.633,-2.624],[-3.326,-0.924],[-2.633,0.785],[-0.924,1.478],[-0.157,1.349]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":5,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.326,-0.326],[0.462,0],[0.326,0.32],[0,0.462],[-0.32,0.32],[-0.462,0],[-0.32,-0.326],[0,-0.462]],"o":[[-0.32,0.32],[-0.462,0],[-0.32,-0.326],[0,-0.462],[0.326,-0.326],[0.462,0],[0.326,0.32],[0,0.462]],"v":[[0.249,0.259],[-0.924,0.739],[-2.106,0.259],[-2.587,-0.924],[-2.106,-2.097],[-0.924,-2.587],[0.249,-2.097],[0.739,-0.924]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":5,"nm":"Merge Paths 2","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"st","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0.4,"ix":5},"lc":1,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"icon","np":6,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[10.326,10.326],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"icon","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[91,15,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"k":[{"s":[182,30],"t":217,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[182,30],"t":292,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}}]},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":32.672,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Taskbar Lofi","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]},{"id":"comp_4","nm":"Recents_LofiApp","fr":60,"pfr":1,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[339.937,151.75,0],"ix":2,"l":2},"a":{"a":0,"k":[339.937,151.75,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.021,-1.766],[0,0],[-2.043,0],[0,0],[1.022,1.767]],"o":[[-1.021,-1.766],[0,0],[-1.022,1.767],[0,0],[2.043,0],[0,0]],"v":[[2.297,-7.675],[-2.297,-7.675],[-9.64,5.025],[-7.343,9],[7.343,9],[9.64,5.025]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"rd","nm":"Round Corners 1","r":{"a":0,"k":9,"ix":1},"ix":2,"mn":"ADBE Vector Filter - RC","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Triangle","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[481.874,21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Triangle","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[457.874,21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[292,25],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Text field","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[334,279],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Text field","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[109,28],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[425.5,208.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[160,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":14,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[400,158.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":1,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[126,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":14,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Received","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[251,78.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Received","np":1,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[334,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[340,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":16,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Message","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82,171.125,0],"ix":2,"l":2},"a":{"a":0,"k":[82,171.125,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,177.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 4","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,165.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 3","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,171.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 2","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82.5,140.5,0],"ix":2,"l":2},"a":{"a":0,"k":[82,140.938,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[132,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Search","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[82,31.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"header","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,257.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 6","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,245.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 5","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,251.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 3","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[132,64],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Message","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[82,171],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"block","np":1,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,96.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":1,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,84.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":1,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,90.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 1","np":1,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app only","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,459,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[200,128],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":18,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Frame 1321317559","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"TrackpadAK_Success_Checkmark","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,198.5,0],"ix":2,"l":2},"a":{"a":0,"k":[95,95,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":190,"h":190,"ip":53,"op":97,"st":53,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"track matte 3","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","tt":1,"tp":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":48,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":54,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":436,"s":[100]},{"t":439,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Global Position","np":4,"mn":"Pseudo/88900","ix":1,"en":1,"ef":[{"ty":10,"nm":"Master Parent","mn":"Pseudo/88900-0001","ix":1,"v":{"a":0,"k":4,"ix":1}},{"ty":3,"nm":"Global Position","mn":"Pseudo/88900-0002","ix":2,"v":{"k":[{"s":[277,197.5],"t":47,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[277,197.5],"t":96,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}]}}]}],"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":47,"op":97,"st":47,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"track matte 2","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Trackpad-JSON_Recents-EDU","tt":1,"tp":5,"refId":"comp_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":12,"s":[0]},{"t":15,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,282,0],"ix":2,"l":2},"a":{"a":0,"k":[277,282,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":554,"h":564,"ip":12,"op":58,"st":-235,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"track matte 1","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":0,"nm":"Trackpad-JSON_Recents-EDU","tt":1,"tp":7,"refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,282,0],"ix":2,"l":2},"a":{"a":0,"k":[277,282,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":554,"h":564,"ip":-217,"op":33,"st":-217,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Global Position","np":4,"mn":"Pseudo/88900","ix":1,"en":1,"ef":[{"ty":10,"nm":"Master Parent","mn":"Pseudo/88900-0001","ix":1,"v":{"a":0,"k":4,"ix":1}},{"ty":3,"nm":"Global Position","mn":"Pseudo/88900-0002","ix":2,"v":{"k":[{"s":[277,197.5],"t":0,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[277,197.5],"t":49,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}]}}]}],"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":50,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980401039,0.768627464771,0.627451002598,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"op","nm":"Stroke align: Outside","a":{"k":[{"s":[7],"t":0,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[7],"t":96,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"frame","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":221,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file +{"v":"5.12.1","fr":60,"ip":0,"op":97,"w":554,"h":564,"nm":"Trackpad-JSON_Recents-Success","ddd":0,"assets":[{"id":"comp_0","nm":"TrackpadAK_Success_Checkmark","fr":60,"layers":[{"ddd":0,"ind":1,"ty":3,"nm":"Check Rotate","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":2,"s":[-16]},{"t":20,"s":[6]}],"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[95.049,95.049,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":228,"st":-72,"bm":0},{"ddd":0,"ind":2,"ty":3,"nm":"Bounce","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.12],"y":[1]},"o":{"x":[0.44],"y":[0]},"t":12,"s":[0]},{"t":36,"s":[-6]}],"ix":10},"p":{"a":0,"k":[81,127,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.263,0.263,0.833],"y":[1.126,1.126,1]},"o":{"x":[0.05,0.05,0.05],"y":[0.958,0.958,0]},"t":1,"s":[80,80,100]},{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.45,0.45,0.167],"y":[0.325,0.325,0]},"t":20,"s":[105,105,100]},{"t":36,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","parent":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-0.289,"ix":10},"p":{"a":0,"k":[14.364,-33.591,0],"ix":2,"l":2},"a":{"a":0,"k":[-0.125,0,0],"ix":1,"l":2},"s":{"a":0,"k":[104.744,104.744,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.401,-0.007],[-10.033,11.235]],"o":[[5.954,7.288],[1.401,0.007],[0,0]],"v":[[-28.591,4.149],[-10.73,26.013],[31.482,-21.255]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.2],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":3,"s":[0]},{"i":{"x":[0.22],"y":[1]},"o":{"x":[0.001],"y":[0.149]},"t":10,"s":[29]},{"t":27,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":11,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":5,"op":44,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[95,95,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.275,0.275,0.21],"y":[1.102,1.102,1]},"o":{"x":[0.037,0.037,0.05],"y":[0.476,0.476,0]},"t":0,"s":[0,0,100]},{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.252,0.252,0.47],"y":[0.159,0.159,0]},"t":16,"s":[120,120,100]},{"t":28,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.32,0.32],"y":[0.11,0.11]},"t":16,"s":[148,148]},{"t":28,"s":[136,136]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":88,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Checkbox - Widget","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]},{"id":"comp_1","nm":"Trackpad-JSON_Recents-EDU","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","parent":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":37,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":47,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":250,"s":[100]},{"t":256,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-20,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-20,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Super Slider","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.64],"y":[0.48]},"o":{"x":[0.36],"y":[0]},"t":121,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":138,"s":[17.5]},{"t":205,"s":[100]}],"ix":1}}]}],"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":62,"s":[41,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":0.56},"o":{"x":0.44,"y":0.44},"t":72,"s":[33,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":248,"s":[33,0],"to":[0,0],"ti":[0,0]},{"t":258,"s":[41,0]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"right circle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":1,"k":[{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":62,"s":[-41,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":0.56},"o":{"x":0.44,"y":0.44},"t":72,"s":[-33,0],"to":[0,0],"ti":[0,0]},{"i":{"x":0.56,"y":1},"o":{"x":0.44,"y":0},"t":248,"s":[-33,0],"to":[0,0],"ti":[0,0]},{"t":258,"s":[-41,0]}],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"left circle","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":62,"s":[36,36]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":72,"s":[28,28]},{"i":{"x":[0.56,0.56],"y":[1,1]},"o":{"x":[0.44,0.44],"y":[0,0]},"t":248,"s":[28,28]},{"t":258,"s":[36,36]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"size","np":2,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":37,"op":345,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,459,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[200,128],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":18,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Frame 1321317559","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"matte","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Recents_EDU Loop","parent":5,"tt":1,"tp":5,"refId":"comp_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[252,157.5,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":504,"h":315,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980401039,0.768627464771,0.627451002598,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"op","nm":"Stroke align: Outside","a":{"k":[{"s":[7],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[7],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"frame","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]},{"id":"comp_2","nm":"Recents_EDU Loop","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"CNTL || playback","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":0,"ix":3},"y":{"a":0,"k":0,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Picker","np":3,"mn":"Pseudo/@@WcSiov6sT3a4/s0XPKYEOQ","ix":1,"en":1,"ef":[{"ty":7,"nm":"Menu","mn":"Pseudo/@@WcSiov6sT3a4/s0XPKYEOQ-0001","ix":1,"v":{"a":0,"k":2,"ix":1}}]},{"ty":5,"nm":"OUTPUT","np":3,"mn":"ADBE Slider Control","ix":2,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"k":[{"s":[1],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.009],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.038],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.093],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.193],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.4],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.636],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.739],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.8],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.84],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.871],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.894],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.912],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.928],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.94],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.951],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.959],"t":266,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.967],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.973],"t":268,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.979],"t":269,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.983],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.987],"t":271,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.99],"t":272,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.993],"t":273,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.995],"t":274,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.997],"t":275,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.998],"t":276,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[1.999],"t":278,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}}]},{"ty":5,"nm":"Keys","np":3,"mn":"ADBE Slider Control","ix":3,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.831],"y":[0.109]},"o":{"x":[0.458],"y":[0.053]},"t":142,"s":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.15],"y":[0.43]},"t":161,"s":[0.15]},{"t":217,"s":[1],"h":1},{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":250,"s":[1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":255,"s":[1.4]},{"t":280,"s":[2],"h":1},{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":380,"s":[2]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":385,"s":[2.4]},{"t":410,"s":[3]}],"ix":1}}]},{"ty":5,"nm":"State (holds)","np":3,"mn":"ADBE Slider Control","ix":4,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":0,"k":0,"ix":1}}]}],"shapes":[],"ip":0,"op":451,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":3,"nm":"Null :: Taskbar drop","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[252,298.112,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[252,298,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":0,"nm":"Taskbar Lofi","parent":3,"refId":"comp_3","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":134,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":143,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":432,"s":[100]},{"t":444,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":0,"ix":3},"y":{"k":[{"s":[-10],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[-10],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}},"a":{"a":0,"k":[91,15,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Super Slider","np":3,"mn":"ADBE Slider Control","ix":1,"en":1,"ef":[{"ty":0,"nm":"Slider","mn":"ADBE Slider Control-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.64],"y":[0.48]},"o":{"x":[0.36],"y":[0]},"t":121,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":138,"s":[17.5]},{"t":205,"s":[100]}],"ix":1}}]}],"w":182,"h":30,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":3,"nm":"Focus Task :: Lift & Drop","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":252,"ix":3},"y":{"k":[{"s":[119.5],"t":250,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[119.746],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[120.54],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[122.071],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[124.808],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[130.5],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[136.982],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[139.835],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[141.489],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[142.613],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[143.442],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[144.082],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[144.593],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.01],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.354],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.642],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[145.884],"t":266,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.089],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.262],"t":268,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.409],"t":269,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.534],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.638],"t":271,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.725],"t":272,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[146.857],"t":274,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]}},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"matte","parent":5,"td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"k":[{"s":[302.247,188.904],"t":251,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[301.752,188.595],"t":252,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[300.798,187.999],"t":253,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[299.093,186.933],"t":254,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[295.546,184.716],"t":255,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[291.506,182.192],"t":256,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[289.729,181.08],"t":257,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[288.698,180.436],"t":258,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.998,179.999],"t":259,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.481,179.676],"t":260,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[287.082,179.427],"t":261,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.764,179.227],"t":262,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.504,179.065],"t":263,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.29,178.931],"t":264,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[286.11,178.819],"t":265,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.832,178.645],"t":267,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.555,178.472],"t":270,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[285.272,178.295],"t":278,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}}]},"p":{"a":0,"k":[0,0],"ix":3},"r":{"k":[{"s":[14.603],"t":251,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.579],"t":252,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.532],"t":253,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.45],"t":254,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.278],"t":255,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[14.082],"t":256,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.996],"t":257,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.946],"t":258,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.912],"t":259,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.887],"t":260,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.868],"t":261,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.853],"t":262,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.84],"t":263,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.83],"t":264,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.821],"t":265,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.808],"t":267,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.794],"t":270,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[13.78],"t":278,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":0,"nm":"Recents_LofiApp","parent":6,"tt":1,"tp":6,"refId":"comp_4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0,0,0],"ix":2,"l":2},"a":{"a":0,"k":[252,157.5,0],"ix":1,"l":2},"s":{"k":[{"s":[59.97,59.97,100],"t":251,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.871,59.871,100],"t":252,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.682,59.682,100],"t":253,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[59.344,59.344,100],"t":254,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[58.64,58.64,100],"t":255,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.839,57.839,100],"t":256,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.486,57.486,100],"t":257,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.281,57.281,100],"t":258,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.142,57.142,100],"t":259,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[57.04,57.04,100],"t":260,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.961,56.961,100],"t":261,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.898,56.898,100],"t":262,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.846,56.846,100],"t":263,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.804,56.804,100],"t":264,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.768,56.768,100],"t":265,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.713,56.713,100],"t":267,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.658,56.658,100],"t":270,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[56.602,56.602,100],"t":278,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"w":504,"h":315,"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":7,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"t":277,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,-30.035,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[176.678,176.678,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"second Tasks Zoom back","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.8,0.8,0.8],"y":[0.15,0.15,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":380,"s":[100,100,100]},{"i":{"x":[0.1,0.1,0.1],"y":[1,1,1]},"o":{"x":[0.05,0.05,0.05],"y":[0.7,0.7,0]},"t":385,"s":[98,98,100]},{"t":410,"s":[95,95,100]}],"ix":6,"l":2}},"ao":0,"shapes":[],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"Null :: Reposition Side Task","parent":9,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.8,"y":0.15},"o":{"x":0.3,"y":0},"t":250,"s":[-318.4,-38,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.7},"t":255,"s":[-277.34,-48.1,0],"to":[0,0,0],"ti":[0,0,0]},{"t":280,"s":[-215.75,-63.25,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":12,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":277,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-111.72,0],"t":250,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-111.197,0],"t":251,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-109.514,0],"t":252,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-106.268,0],"t":253,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-100.462,0],"t":254,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-88.39,0],"t":255,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-74.643,0],"t":256,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-68.591,0],"t":257,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-65.083,0],"t":258,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-62.7,0],"t":259,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-60.943,0],"t":260,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-59.584,0],"t":261,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-58.5,0],"t":262,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-57.616,0],"t":263,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-56.886,0],"t":264,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-56.276,0],"t":265,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-55.762,0],"t":266,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-55.328,0],"t":267,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.96,0],"t":268,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.648,0],"t":269,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.385,0],"t":270,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-54.163,0],"t":271,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.977,0],"t":272,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.824,0],"t":273,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.698,0],"t":274,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.598,0],"t":275,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.521,0],"t":276,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.463,0],"t":277,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.424,0],"t":278,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":10,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.963},"t":217,"s":[-84.8,0,0],"to":[0,0,0],"ti":[0,0,0]},{"t":250,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.8,0.8],"y":[0.15,0.15]},"o":{"x":[0.3,0.3],"y":[0,0]},"t":250,"s":[302.4,189]},{"i":{"x":[0.1,0.1],"y":[1,1]},"o":{"x":[0.05,0.05],"y":[0.7,0.7]},"t":255,"s":[227.56,142.34]},{"t":280,"s":[115.3,72.35]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":1,"k":[{"i":{"x":[0.8],"y":[0.15]},"o":{"x":[0.3],"y":[0]},"t":250,"s":[14.6]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.05],"y":[0.7]},"t":255,"s":[14.272]},{"t":280,"s":[13.78]}],"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":14,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":268,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":277,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[0,-53.175,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[0,-53.175,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":383,"s":[100]},{"t":392,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.8,"y":0.15},"o":{"x":0.3,"y":0},"t":250,"s":[-411.95,20.325,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0.7},"t":255,"s":[-333.47,29.183,0],"to":[0,0,0],"ti":[0,0,0]},{"t":280,"s":[-215.75,42.47,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[115.3,72.35],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":13.78,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":197,"op":511,"st":0,"ct":1,"bm":0}]},{"id":"comp_3","nm":"Taskbar Lofi","fr":60,"layers":[{"ddd":0,"ind":2,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[76,0,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[76,0,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[167,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7511","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[167,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 5","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[139,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[139,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[139,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7508","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[139,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 4","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[111,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[111,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[111,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7507","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[111,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 3","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[83,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[83,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[83,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7506","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[83,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 2","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[55,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[55,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[55,15,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 7505","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[55,15],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app - 1","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":90,"ix":10},"p":{"k":[{"s":[36,15,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[36,15,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"k":[{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,-0.5],[5,-0.5]],"c":false}],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,-0.5],[5,-0.5]],"c":false}],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}]},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"divider","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":9,"sr":1,"ks":{"o":{"k":[{"s":[100],"t":217,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[100],"t":292,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"r":{"a":0,"k":0,"ix":10},"p":{"k":[{"s":[-70.349,0.652,0],"t":217,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[-70.349,0.652,0],"t":292,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}],"l":2},"a":{"a":0,"k":[6.826,6.826,0],"ix":1,"l":2},"s":{"k":[{"s":[100,100,100],"t":217,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}},{"s":[100,100,100],"t":292,"i":{"x":[1,1,1],"y":[1,1,1]},"o":{"x":[0,0,0],"y":[0,0,0]}}],"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 12","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,9.501],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 12","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 11","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[2.5,2.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 11","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.381,0],[0,1.381],[1.381,0],[0,-1.381]],"o":[[1.381,0],[0,-1.381],[-1.381,0],[0,1.381]],"v":[[0,2.5],[2.5,0],[0,-2.5],[-2.5,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[9.5,2.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 5","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.185,0.148],[0,0],[0,0],[0,0],[-0.086,0.24],[0,0.271],[0.468,0.462],[0.671,0],[0.468,-0.468],[0,-0.671],[-0.462,-0.468],[-0.671,0],[-0.24,0.086]],"o":[[0,0],[0,0],[0,0],[0.148,-0.185],[0.086,-0.24],[0,-0.671],[-0.462,-0.468],[-0.671,0],[-0.462,0.462],[0,0.671],[0.468,0.462],[0.271,0],[0.24,-0.086]],"v":[[0.48,0.998],[2.809,3.326],[3.326,2.809],[0.998,0.48],[1.349,-0.157],[1.478,-0.924],[0.776,-2.624],[-0.924,-3.326],[-2.633,-2.624],[-3.326,-0.924],[-2.633,0.785],[-0.924,1.478],[-0.157,1.349]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":5,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.326,-0.326],[0.462,0],[0.326,0.32],[0,0.462],[-0.32,0.32],[-0.462,0],[-0.32,-0.326],[0,-0.462]],"o":[[-0.32,0.32],[-0.462,0],[-0.32,-0.326],[0,-0.462],[0.326,-0.326],[0.462,0],[0.326,0.32],[0,0.462]],"v":[[0.249,0.259],[-0.924,0.739],[-2.106,0.259],[-2.587,-0.924],[-2.106,-2.097],[-0.924,-2.587],[0.249,-2.097],[0.739,-0.924]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":5,"nm":"Merge Paths 2","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"st","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":0.4,"ix":5},"lc":1,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"icon","np":6,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[10.326,10.326],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"icon","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[91,15,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"k":[{"s":[182,30],"t":217,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}},{"s":[182,30],"t":292,"i":{"x":[1,1],"y":[1,1]},"o":{"x":[0,0],"y":[0,0]}}]},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":32.672,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Taskbar Lofi","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]},{"id":"comp_4","nm":"Recents_LofiApp","fr":60,"pfr":1,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[339.937,151.75,0],"ix":2,"l":2},"a":{"a":0,"k":[339.937,151.75,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[1.021,-1.766],[0,0],[-2.043,0],[0,0],[1.022,1.767]],"o":[[-1.021,-1.766],[0,0],[-1.022,1.767],[0,0],[2.043,0],[0,0]],"v":[[2.297,-7.675],[-2.297,-7.675],[-9.64,5.025],[-7.343,9],[7.343,9],[9.64,5.025]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"rd","nm":"Round Corners 1","r":{"a":0,"k":9,"ix":1},"ix":2,"mn":"ADBE Vector Filter - RC","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Triangle","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[481.874,21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Triangle","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[18,18],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[457.874,21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[292,25],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Text field","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[334,279],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Text field","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[109,28],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[425.5,208.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[160,56],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":14,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[400,158.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Sent","np":1,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[126,40],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":14,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Received","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[251,78.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Received","np":1,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[334,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[340,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":16,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Message","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82,171.125,0],"ix":2,"l":2},"a":{"a":0,"k":[82,171.125,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,177.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 4","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,165.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 3","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,171.125],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 2","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[82.5,140.5,0],"ix":2,"l":2},"a":{"a":0,"k":[82,140.938,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[132,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":39.375,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Search","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[82,31.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"header","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,257.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 6","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,245.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 5","np":1,"cix":2,"bm":0,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,251.375],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 3","np":1,"cix":2,"bm":0,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[132,64],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Message","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[82,171],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"block","np":1,"cix":2,"bm":0,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[64,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[80,96.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 2","np":1,"cix":2,"bm":0,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[92,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[94,84.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Line 1","np":1,"cix":2,"bm":0,"ix":7,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[20,20],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":200,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Avatar","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[34,90.875],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"circle 1","np":1,"cix":2,"bm":0,"ix":8,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[252,157.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"app only","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,459,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[200,128],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":18,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.32549020648,0.270588248968,0.164705887437,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Frame 1321317559","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"TrackpadAK_Success_Checkmark","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,198.5,0],"ix":2,"l":2},"a":{"a":0,"k":[95,95,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":190,"h":190,"ip":53,"op":97,"st":53,"ct":1,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"track matte 3","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":".onSecondaryFixed","cl":"onSecondaryFixed","tt":1,"tp":3,"sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":48,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":54,"s":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":436,"s":[100]},{"t":439,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Global Position","np":4,"mn":"Pseudo/88900","ix":1,"en":1,"ef":[{"ty":10,"nm":"Master Parent","mn":"Pseudo/88900-0001","ix":1,"v":{"a":0,"k":4,"ix":1}},{"ty":3,"nm":"Global Position","mn":"Pseudo/88900-0002","ix":2,"v":{"k":[{"s":[277,197.5],"t":47,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[277,197.5],"t":96,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}]}}]}],"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.145098039216,0.101960784314,0.01568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":47,"op":97,"st":47,"ct":1,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"track matte 2","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":6,"ty":0,"nm":"Trackpad-JSON_Recents-EDU","tt":1,"tp":5,"refId":"comp_1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":12,"s":[0]},{"t":15,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,282,0],"ix":2,"l":2},"a":{"a":0,"k":[277,282,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":554,"h":564,"ip":12,"op":58,"st":-235,"ct":1,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"track matte 1","td":1,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":511,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":8,"ty":0,"nm":"Trackpad-JSON_Recents-EDU","tt":1,"tp":7,"refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,282,0],"ix":2,"l":2},"a":{"a":0,"k":[277,282,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"w":554,"h":564,"ip":-217,"op":33,"st":-217,"ct":1,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":".onSecondaryFixedVariant","cl":"onSecondaryFixedVariant","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":5,"nm":"Global Position","np":4,"mn":"Pseudo/88900","ix":1,"en":1,"ef":[{"ty":10,"nm":"Master Parent","mn":"Pseudo/88900-0001","ix":1,"v":{"a":0,"k":4,"ix":1}},{"ty":3,"nm":"Global Position","mn":"Pseudo/88900-0002","ix":2,"v":{"k":[{"s":[277,197.5],"t":0,"i":{"x":1,"y":1},"o":{"x":0,"y":0}},{"s":[277,197.5],"t":49,"i":{"x":1,"y":1},"o":{"x":0,"y":0}}]}}]}],"shapes":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.325490196078,0.270588235294,0.164705882353,1],"ix":4},"o":{"a":0,"k":50,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":50,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980401039,0.768627464771,0.627451002598,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"illustrations: action key","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":600,"st":0,"ct":1,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":".secondaryFixedDim","cl":"secondaryFixedDim","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[277,197.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[504,315],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":28,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"st","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":14,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"op","nm":"Stroke align: Outside","a":{"k":[{"s":[7],"t":0,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}},{"s":[7],"t":96,"i":{"x":[1],"y":[1]},"o":{"x":[0],"y":[0]}}]},"lj":1,"ml":{"a":0,"k":4,"ix":3},"ix":3,"mn":"ADBE Vector Filter - Offset","hd":false},{"ty":"fl","c":{"a":0,"k":[0.850980392157,0.76862745098,0.627450980392,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"frame","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":221,"st":0,"ct":1,"bm":0}],"markers":[],"props":{}}
\ No newline at end of file diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 22d80135a2ac..b91bfd6c9520 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -35,14 +35,14 @@ <string name="extreme_battery_saver_text" msgid="8455810156739865335">"Ekstreem"</string> <string name="status_bar_settings_auto_rotation" msgid="8329080442278431708">"Outodraai skerm"</string> <string name="usb_device_permission_prompt" msgid="4414719028369181772">"Gee <xliff:g id="APPLICATION">%1$s</xliff:g> toegang tot <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> - <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Laat <xliff:g id="APPLICATION">%1$s</xliff:g> toe om by <xliff:g id="USB_DEVICE">%2$s</xliff:g> in te gaan?\nOpneemtoestemming is nie aan hierdie program verleen nie, maar dit kan oudio deur hierdie USB-toestel vasvang."</string> + <string name="usb_device_permission_prompt_warn" msgid="2309129784984063656">"Laat <xliff:g id="APPLICATION">%1$s</xliff:g> toe om by <xliff:g id="USB_DEVICE">%2$s</xliff:g> in te gaan?\nOpneemtoestemming is nie aan hierdie app verleen nie, maar dit kan oudio deur hierdie USB-toestel vasvang."</string> <string name="usb_audio_device_permission_prompt_title" msgid="4221351137250093451">"Gee <xliff:g id="APPLICATION">%1$s</xliff:g> toegang tot <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string> <string name="usb_audio_device_confirm_prompt_title" msgid="8828406516732985696">"Maak <xliff:g id="APPLICATION">%1$s</xliff:g> oop om <xliff:g id="USB_DEVICE">%2$s</xliff:g> te hanteer?"</string> <string name="usb_audio_device_prompt_warn" msgid="2504972133361130335">"Opneemtoestemming is nie aan hierdie program verleen nie, maar dit kan oudio deur hierdie USB-toestel opneem. As jy <xliff:g id="APPLICATION">%1$s</xliff:g> met hierdie toestel gebruik, kan dit verhinder dat jy oproepe, kennisgewings en wekkers hoor."</string> <string name="usb_audio_device_prompt" msgid="7944987408206252949">"As jy <xliff:g id="APPLICATION">%1$s</xliff:g> met hierdie toestel gebruik, kan dit verhinder dat jy oproepe, kennisgewings en wekkers hoor."</string> <string name="usb_accessory_permission_prompt" msgid="717963550388312123">"Gee <xliff:g id="APPLICATION">%1$s</xliff:g> toegang tot <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string> <string name="usb_device_confirm_prompt" msgid="4091711472439910809">"Hanteer <xliff:g id="USB_DEVICE">%2$s</xliff:g> met <xliff:g id="APPLICATION">%1$s</xliff:g>?"</string> - <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"Maak <xliff:g id="APPLICATION">%1$s</xliff:g> oop om <xliff:g id="USB_DEVICE">%2$s</xliff:g> te hanteer?\nOpneemtoestemming is nie aan hierdie program verleen nie, maar dit kan oudio deur hierdie USB-toestel vasvang."</string> + <string name="usb_device_confirm_prompt_warn" msgid="990208659736311769">"Maak <xliff:g id="APPLICATION">%1$s</xliff:g> oop om <xliff:g id="USB_DEVICE">%2$s</xliff:g> te hanteer?\nOpneemtoestemming is nie aan hierdie app verleen nie, maar dit kan oudio deur hierdie USB-toestel vasvang."</string> <string name="usb_accessory_confirm_prompt" msgid="5728408382798643421">"Hanteer <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> met <xliff:g id="APPLICATION">%1$s</xliff:g>?"</string> <string name="usb_accessory_uri_prompt" msgid="6756649383432542382">"Geen geïnstalleerde programme werk met hierdie USB-toebehoorsel nie. Vind meer uit oor hierdie toebehoorsel by <xliff:g id="URL">%1$s</xliff:g>"</string> <string name="title_usb_accessory" msgid="1236358027511638648">"USB-toebehoorsel"</string> @@ -83,7 +83,7 @@ <string name="screenshot_failed_to_save_user_locked_text" msgid="6156607948256936920">"Toestel moet ontsluit word voordat skermkiekie gestoor kan word"</string> <string name="screenshot_failed_to_save_unknown_text" msgid="1506621600548684129">"Probeer weer skermkiekie neem"</string> <string name="screenshot_failed_to_save_text" msgid="7232739948999195960">"Kan nie skermkiekie stoor nie"</string> - <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"Die program of jou organisasie laat nie toe dat skermkiekies geneem word nie"</string> + <string name="screenshot_failed_to_capture_text" msgid="7818288545874407451">"Die app of jou organisasie laat nie toe dat skermkiekies geneem word nie"</string> <string name="screenshot_blocked_by_admin" msgid="5486757604822795797">"Die neem van skermskote word deur jou IT-admin geblokkeer"</string> <string name="screenshot_edit_label" msgid="8754981973544133050">"Wysig"</string> <string name="screenshot_edit_description" msgid="3333092254706788906">"Wysig skermkiekie"</string> @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Om ’n app met ’n legstuk oop te maak, sal jy moet verifieer dat dit jy is. Hou ook in gedagte dat enigeen dit kan bekyk, selfs wanneer jou tablet gesluit is. Sommige legstukke is moontlik nie vir jou sluitskerm bedoel nie en dit kan onveilig wees om dit hier by te voeg."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Het dit"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Legstukke"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"As jy legstukke as ’n kortpad op die sluitskerm wil byvoeg, moet jy seker maak dit is in instellings geaktiveer."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Wissel gebruiker"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"aftrekkieslys"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Alle programme en data in hierdie sessie sal uitgevee word."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Skakel oor na app links of bo terwyl jy verdeelde skerm gebruik"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tydens verdeelde skerm: verplaas ’n app van een skerm na ’n ander"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Skuif aktiewe venster tussen skerms"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Skuif venster na links"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Skuif venster na regs"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maak venster groot"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Maak venster klein"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Invoer"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Skakel oor na volgende taal"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Skakel oor na vorige taal"</string> @@ -996,7 +995,7 @@ <string name="tuner_left" msgid="5758862558405684490">"Links"</string> <string name="tuner_right" msgid="8247571132790812149">"Regs"</string> <string name="tuner_menu" msgid="363690665924769420">"Kieslys"</string> - <string name="tuner_app" msgid="6949280415826686972">"<xliff:g id="APP">%1$s</xliff:g>-program"</string> + <string name="tuner_app" msgid="6949280415826686972">"<xliff:g id="APP">%1$s</xliff:g>-app"</string> <string name="notification_channel_alerts" msgid="3385787053375150046">"Opletberigte"</string> <string name="notification_channel_battery" msgid="9219995638046695106">"Battery"</string> <string name="notification_channel_screenshot" msgid="7665814998932211997">"Skermkiekies"</string> @@ -1007,8 +1006,8 @@ <string name="notification_channel_accessibility" msgid="8956203986976245820">"Toeganklikheid"</string> <string name="instant_apps" msgid="8337185853050247304">"Kitsapps"</string> <string name="instant_apps_title" msgid="8942706782103036910">"<xliff:g id="APP">%1$s</xliff:g> loop tans"</string> - <string name="instant_apps_message" msgid="6112428971833011754">"Program is oopgemaak sonder dat dit geïnstalleer is."</string> - <string name="instant_apps_message_with_help" msgid="1816952263531203932">"Program is oopgemaak sonder dat dit geïnstalleer is. Tik om meer te wete te kom."</string> + <string name="instant_apps_message" msgid="6112428971833011754">"App is oopgemaak sonder dat dit geïnstalleer is."</string> + <string name="instant_apps_message_with_help" msgid="1816952263531203932">"App is oopgemaak sonder dat dit geïnstalleer is. Tik om meer inligting te kry."</string> <string name="app_info" msgid="5153758994129963243">"Appinligting"</string> <string name="go_to_web" msgid="636673528981366511">"Gaan na blaaier"</string> <string name="mobile_data" msgid="4564407557775397216">"Mobiele data"</string> @@ -1019,8 +1018,8 @@ <string name="dnd_is_off" msgid="3185706903793094463">"Moenie Steur Nie is af"</string> <string name="dnd_is_on" msgid="7009368176361546279">"Moenie Steur Nie is aan"</string> <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="qs_dnd_prompt_app" msgid="4027984447935396820">"\'n App (<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 app 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> @@ -1030,11 +1029,11 @@ <string name="auto_data_switch_disable_message" msgid="5885533647399535852">"Mobiele data sal nie outomaties op grond van beskikbaarheid oorskakel nie"</string> <string name="auto_data_switch_dialog_negative_button" msgid="2370876875999891444">"Nee, dankie"</string> <string name="auto_data_switch_dialog_positive_button" msgid="8531782041263087564">"Ja, skakel oor"</string> - <string name="touch_filtered_warning" msgid="8119511393338714836">"Instellings kan nie jou antwoord verifieer nie omdat \'n program \'n toestemmingversoek verberg."</string> + <string name="touch_filtered_warning" msgid="8119511393338714836">"Instellings kan nie jou antwoord verifieer nie omdat \'n app \'n toestemmingversoek verberg."</string> <string name="slice_permission_title" msgid="3262615140094151017">"Laat <xliff:g id="APP_0">%1$s</xliff:g> toe om <xliff:g id="APP_2">%2$s</xliff:g>-skyfies te wys?"</string> <string name="slice_permission_text_1" msgid="6675965177075443714">"– Dit kan inligting van <xliff:g id="APP">%1$s</xliff:g> af lees"</string> <string name="slice_permission_text_2" msgid="6758906940360746983">"– Dit kan handelinge binne <xliff:g id="APP">%1$s</xliff:g> uitvoer"</string> - <string name="slice_permission_checkbox" msgid="4242888137592298523">"Laat <xliff:g id="APP">%1$s</xliff:g> toe om skyfies uit enige program te gebruik"</string> + <string name="slice_permission_checkbox" msgid="4242888137592298523">"Laat <xliff:g id="APP">%1$s</xliff:g> toe om skyfies uit enige app te gebruik"</string> <string name="slice_permission_allow" msgid="6340449521277951123">"Laat toe"</string> <string name="slice_permission_deny" msgid="6870256451658176895">"Weier"</string> <string name="auto_saver_title" msgid="6873691178754086596">"Tik om Batterybespaarder te skeduleer"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Stelselkontroles"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Stelselapps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Verrigting van veelvuldige take"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Onlangse apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Verdeelde skerm"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Invoer"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Appkortpaaie"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Kortpadsleutels"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Pasmaak kortpadsleutels"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Verwyder kortpad?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Druk sleutel om kortpad toe te wys"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Dit sal jou gepasmaakte kortpad permanent uitvee."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Soekkortpaaie"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Geen soekresultate nie"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Vou ikoon in"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikoon vir Handeling- of Meta-sleutel"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plusikoon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Pasmaak"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Klaar"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Vou ikoon uit"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"of"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"vorentoe-skuinsstreep"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Sleephandvatsel"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Sleutelbordinstellings"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Stel kortpad"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Verwyder"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Kanselleer"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Druk sleutel"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Sleutelkombinasie is reeds in gebruik. Probeer ’n ander sleutel."</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index e36aab27d541..cf73b71168b9 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ምግብር በመጠቀም መተግበሪያ ለመክፈት እርስዎ መሆንዎን ማረጋገጥ አለብዎት። እንዲሁም የእርስዎ ጡባዊ በተቆለፈበት ጊዜ እንኳን ማንኛውም ሰው እነሱን ማየት እንደሚችል ከግምት ውስጥ ያስገቡ። አንዳንድ ምግብሮች ለማያ ገፅ ቁልፍዎ የታሰቡ ላይሆኑ ይችላሉ እና እዚህ ለማከል አስተማማኝ ላይሆኑ ይችላሉ።"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ገባኝ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ምግብሮች"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"ማያ ገጽ ቁልፍ ላይ ምግብሮችን እንደ አቋራጭ ለማከል በቅንብሮች ውስጥ መንቃቱን ያረጋግጡ።"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ተጠቃሚ ቀይር"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ወደታች ተጎታች ምናሌ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"በዚህ ክፍለ-ጊዜ ውስጥ ያሉ ሁሉም መተግበሪያዎች እና ውሂብ ይሰረዛሉ።"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"የተከፈለ ማያ ገጽን ሲጠቀሙ በቀኝ ወይም ከላይ ወዳለ መተግበሪያ ይቀይሩ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"በተከፈለ ማያ ገጽ ወቅት፡- መተግበሪያን ከአንዱ ወደ ሌላው ተካ"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"በማሳያዎች መካከል ንቁ መስኮትን ያንቀሳቅሱ"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"መስኮትን ወደ ግራ አሳንስ"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"መስኮትን ወደ ቀኝ አሳንስ"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"መስኮትን አሳድግ"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"መስኮት አሳንስ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ግቤት"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ወደ ቀጣዩ ቋንቋ ቀይር"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"ወደ ቀዳሚ ቋንቋ ቀይር"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"የሥርዓት መቆጣጠሪያዎች"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"የሥርዓት መተግበሪያዎች"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ብዙ ተግባራትን በተመሳሳይ ጊዜ ማከናወን"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"የቅርብ ጊዜ መተግበሪያዎች"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"የተከፈለ ማያ ገፅ"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ግብዓት"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"የመተግበሪያ አቋራጮች"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"የቁልፍ ሰሌዳ አቋራጮች"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"የቁልፍ ሰሌዳ አቋራጮችን ያብጁ"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"አቋራጭ ይወገድ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"አቋራጭ ለመመደብ ቁልፍ ይጫኑ"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ይህ ብጁ አቋራጭዎን በቋሚነት ይሰርዛል።"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"የፍለጋ አቋራጮች"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ምንም የፍለጋ ውጤቶች የሉም"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"መሰብሰቢያ አዶ"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"የእርምጃ ወይም ሜታ ቁልፍ አዶ"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"የመደመር አዶ"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"አብጅ"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ተከናውኗል"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"መዘርጊያ አዶ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ወይም"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"ሲደመር"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ወደፊት ህዝባር"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"መያዣ ይጎትቱ"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"የቁልፍ ሰሌዳ ቅንብሮች"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"አቋራጭ አቀናብር"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"አስወግድ"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"ይቅር"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"ቁልፍ ይጫኑ"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"የቁልፍ ጥምረት አስቀድሞ በሥራ ላይ ነው። ሌላ ቁልፍ ይሞክሩ።"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index d6e91cc9c3c2..4ff613163294 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"لفتح تطبيق باستخدام تطبيق مصغَّر، عليك إثبات هويتك. يُرجى ملاحظة أنّ أي شخص يمكنه الاطّلاع محتوى التطبيقات المصغَّرة، حتى وإن كان جهازك اللوحي مُقفلاً. بعض التطبيقات المصغّرة قد لا تكون مُصمَّمة لإضافتها إلى شاشة القفل، وقد يكون هذا الإجراء غير آمن."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"حسنًا"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"التطبيقات المصغَّرة"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"لإضافة التطبيقات المصغّرة على شاشة القفل كاختصار، تأكَّد من تفعيلها في الإعدادات."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"تبديل المستخدم"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"القائمة المنسدلة"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"سيتم حذف كل التطبيقات والبيانات في هذه الجلسة."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"عناصر التحكّم في النظام"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"تطبيقات النظام"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"تعدُّد المهام"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"التطبيقات المستخدمة مؤخرًا"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"تقسيم الشاشة"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"الإدخال"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"اختصارات التطبيقات"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"اختصارات لوحة المفاتيح"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"تخصيص اختصارات لوحة المفاتيح"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"هل تريد إزالة هذا الاختصار؟"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"اضغط على مفتاح لتخصيص الاختصار"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"سيؤدي هذا الإجراء إلى حذف الاختصار المخصّص نهائيًا."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"البحث في الاختصارات"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ما مِن نتائج بحث"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"رمز التصغير"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"رمز مفتاح الإجراء (مفتاح Meta)"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"رمز علامة الجمع (+)"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"تخصيص"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"تم"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"رمز التوسيع"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"أو"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"إعدادات لوحة المفاتيح"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ضبط الاختصار"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"إزالة"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"إلغاء"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"اضغط على مفتاح"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"يتم حاليًا استخدام مجموعة المفاتيح هذه. يُرجى تجربة مفتاح آخر."</string> diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml index 8f5b1e18f626..f91a3b011c5d 100644 --- a/packages/SystemUI/res/values-as/strings.xml +++ b/packages/SystemUI/res/values-as/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"এটা ৱিজেট ব্যৱহাৰ কৰি কোনো এপ্ খুলিবলৈ, এয়া আপুনিয়েই বুলি সত্যাপন পৰীক্ষা কৰিব লাগিব। লগতে, মনত ৰাখিব যে যিকোনো লোকেই সেইবোৰ চাব পাৰে, আনকি আপোনাৰ টেবলেটটো লক হৈ থাকিলেও। কিছুমান ৱিজেট হয়তো আপোনাৰ লক স্ক্ৰীনৰ বাবে কৰা হোৱা নাই আৰু ইয়াত যোগ কৰাটো অসুৰক্ষিত হ’ব পাৰে।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"বুজি পালোঁ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ৱিজেট"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"লক স্ক্ৰীনৰ ৱিজেট সুবিধাটো শ্বৰ্টকাট হিচাপে যোগ দিবলৈ ছেটিঙত সেয়া সক্ষম হৈ থকাটো নিশ্চিত কৰক।"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ব্যৱহাৰকাৰী সলনি কৰক"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"পুল-ডাউনৰ মেনু"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"এই ছেশ্বনৰ আটাইবোৰ এপ্ আৰু ডেটা মচা হ\'ব।"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"বিভাজিত স্ক্ৰীন ব্যৱহাৰ কৰাৰ সময়ত বাওঁফালে অথবা ওপৰত থকা এপলৈ সলনি কৰক"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"বিভাজিত স্ক্ৰীনৰ ব্যৱহাৰ কৰাৰ সময়ত: কোনো এপ্ এখন স্ক্ৰীনৰ পৰা আনখনলৈ নিয়ক"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"ডিছপ্লে’সমূহৰ মাজত সক্রিয় হৈ থকা ৱিণ্ড’ সলনা সলনিকৈ ব্যৱহাৰ কৰক"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"ৱিণ্ড’ বাওঁফাললৈ স্থানান্তৰ কৰক"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"ৱিণ্ড’ সোঁফাললৈ স্থানান্তৰ কৰক"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"ৱিণ্ড’ মেক্সিমাইজ কৰক"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"ৱিণ্ড’ মিনিমাইজ কৰক"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ইনপুট"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"পৰৱৰ্তী ভাষাটোলৈ সলনি কৰক"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"পূৰ্বৰ ভাষালৈ সলনি কৰক"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"ছিষ্টেমৰ নিয়ন্ত্ৰণ"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"ছিষ্টেম এপ্"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"মাল্টিটাস্কিং"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"শেহতীয়া এপ্সমূহ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"বিভাজিত স্ক্ৰীন"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ইনপুট"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"এপ্ শ্বৰ্টকাটসমূহ"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"কীব’ৰ্ডৰ শ্বৰ্টকাট"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"কীব’ৰ্ডৰ শ্বৰ্টকাট কাষ্টমাইজ কৰক"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"শ্বৰ্টকাট আঁতৰাবনে?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"শ্বৰ্টকাটৰ ভূমিকা অৰ্পণ কৰিবলৈ কী টিপক"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"এইটোৱে আপোনাৰ কাষ্টম শ্বৰ্টকাট মচিব।"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"সন্ধানৰ শ্বৰ্টকাট"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"সন্ধানৰ কোনো ফলাফল নাই"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"সংকোচন কৰাৰ চিহ্ন"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"কাৰ্য বা মেটা কীৰ চিহ্ন"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"যোগ চিনৰ চিহ্ন"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"কাষ্টমাইজ কৰক"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"হ’ল"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"বিস্তাৰ কৰাৰ চিহ্ন"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"অথবা"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"যোগ চিন"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ফৰৱাৰ্ড শ্লেশ্ব"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ড্ৰেগ হেণ্ডেল"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"কীব’ৰ্ডৰ ছেটিং"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"শ্বৰ্টকাট ছেট কৰক"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"আঁতৰাওক"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"বাতিল কৰক"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"কী টিপক"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"কীৰ মিশ্ৰণ ইতিমধ্যে ব্যৱহাৰ হৈ আছে। অন্য এটা কী ব্যৱহাৰ কৰি চাওক।"</string> diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml index 1126da15496d..84299dc67ec0 100644 --- a/packages/SystemUI/res/values-az/strings.xml +++ b/packages/SystemUI/res/values-az/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Vidcetdən istifadə edərək tətbiqi açmaq üçün kimliyi doğrulamalısınız. Planşet kilidli olsa da, hər kəs vidcetlərə baxa bilər. Bəzi vidcetlər kilid ekranı üçün nəzərdə tutulmayıb və bura əlavə etmək təhlükəli ola bilər."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Anladım"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Vidcetlər"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Kilidli ekrana qısayol kimi Vidcet əlavə etmək üçün onun ayarlarda aktiv olduğundan əmin olun."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Switch user"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"aşağı çəkilən menyu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Bu sessiyada bütün tətbiqlər və data silinəcək."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bölünmüş ekran istifadə edərkən solda və ya yuxarıda tətbiqə keçin"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Bölünmüş ekran rejimində: tətbiqi birindən digərinə dəyişin"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Aktiv pəncərəni displeylər arasında hərəkət etdirin"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Pəncərəni sola hərəkət etdirin"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Pəncərəni sağa hərəkət etdirin"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Pəncərəni böyüdün"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Pəncərəni minimallaşdırın"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Daxiletmə"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Növbəti dilə keçin"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Əvvəlki dilə keçin"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Sistem nizamlayıcıları"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Sistem tətbiqləri"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Çoxsaylı tapşırıq icrası"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Son tətbiqlər"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Bölünmüş ekran"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Daxiletmə"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Tətbiq qısayolları"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klaviatura qısayolları"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Klaviatura qısayollarını fərdiləşdirin"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Qısayol silinsin?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Qısayol təyin etmək üçün düyməni basın"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Bu, fərdi qısayolunuzu həmişəlik siləcək."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Axtarış qısayolları"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Axtarış nəticəsi yoxdur"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"İkonanı yığcamlaşdırın"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Əməliyyat və ya Meta düyməsi ikonası"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Üstəgəl ikonası"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Fərdiləşdirin"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Hazırdır"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"İkonanı genişləndirin"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"və ya"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"irəli sləş"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Dəstəyi çəkin"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Klaviatura ayarları"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Qısayol ayarlayın"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Silin"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Ləğv edin"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Düyməni basın"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Düymə kombinasiyası artıq istifadə olunur. Başqa düyməni sınayın."</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index a996c8a6a6b9..bc385a10160f 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Da biste otvorili aplikaciju koja koristi vidžet, treba da potvrdite da ste to vi. Imajte u vidu da svako može da ga vidi, čak i kada je tablet zaključan. Neki vidžeti možda nisu namenjeni za zaključani ekran i možda nije bezbedno da ih tamo dodate."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Važi"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Vidžeti"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Da biste dodali vidžete na zaključani ekran kao prečicu, uverite se da je to omogućeno u podešavanjima."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Zameni korisnika"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"padajući meni"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Sve aplikacije i podaci u ovoj sesiji će biti izbrisani."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pređite u aplikaciju sleva ili iznad dok koristite podeljeni ekran"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"U režimu podeljenog ekrana: zamena jedne aplikacije drugom"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Premesti aktivan prozor na sledeći ekran"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Pomerite prozor nalevo"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Pomerite prozor nadesno"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Povećajte prozor"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Smanjite prozor"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Unos"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Pređi na sledeći jezik"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Pređi na prethodni jezik"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Sistemske kontrole"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Sistemske aplikacije"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Obavljanje više zadataka istovremeno"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nedavne aplikacije"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Podeljeni ekran"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Unos"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Prečice za aplikacije"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tasterske prečice"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prilagodite tasterske prečice"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Želite da uklonite prečicu?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Pritisnite taster da biste dodelili prečicu"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Ovim ćete trajno izbrisati prilagođenu prečicu."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pretražite prečice"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nema rezultata pretrage"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za skupljanje"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikona tastera za radnju ili meta tastera"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikona znaka plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prilagodi"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za proširivanje"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ili"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"kosa crta unapred"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Marker za prevlačenje"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Podešavanja tastature"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Podesi prečicu"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Ukloni"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Otkaži"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Pritisnite taster"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Kombinacija tastera se već koristi. Probajte sa drugim tasterom."</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index c14d1b5ee7c9..a5f4da95a892 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Каб адкрыць праграму з дапамогай віджэта, вам неабходна будзе пацвердзіць сваю асобу. Таксама памятайце, што такія віджэты могуць пабачыць іншыя людзі, нават калі экран планшэта заблакіраваны. Некаторыя віджэты могуць не падыходзіць для выкарыстання на экране блакіроўкі, і дадаваць іх сюды можа быць небяспечна."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Зразумела"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Віджэты"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Каб можна было дадаць віджэты на экран блакіроўкі ў якасці спалучэння клавіш, яны павінны быць уключаны ў наладах."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Перайсці да іншага карыстальніка"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"высоўнае меню"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Усе праграмы і даныя гэтага сеанса будуць выдалены."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Пераключыцца на праграму злева або ўверсе на падзеленым экране"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"У рэжыме падзеленага экрана замяніць адну праграму на іншую"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Перамясціць актыўнае акно паміж дысплэямі"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Перамясціць акно ўлева"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Перамясціць акно ўправа"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Разгарнуць акно"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Згарнуць акно"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Увод"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Пераключыцца на наступную мову"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Пераключыцца на папярэднюю мову"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Элементы кіравання сістэмай"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Сістэмныя праграмы"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Шматзадачнасць"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Нядаўнія праграмы"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Падзелены экран"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Увод"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Ярлыкі праграм"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Спалучэнні клавіш"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Наладзіць спалучэнні клавіш"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Выдаліць спалучэнне клавіш?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Націсніце клавішу, каб прызначыць спалучэнне клавіш"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Гэта дзеянне назаўсёды выдаліць прызначанае вамі спалучэнне клавіш."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Пошук спалучэнняў клавіш"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Няма вынікаў пошуку"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок \"Згарнуць\""</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Значок клавішы дзеяння (мета-клавішы)"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Значок плюса"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Наладзіць"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Гатова"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок \"Разгарнуць\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"або"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"+"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"касая рыса ўправа"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Маркер перацягвання"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Налады клавіятуры"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Наладзіць спалучэнне клавіш"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Выдаліць"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Скасаваць"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Націсніце клавішу"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Гэта спалучэнне клавіш ужо выкарыстоўваецца. Паспрабуйце іншую клавішу."</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 73de179729d7..e36cf3098117 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"За да отворите дадено приложение посредством приспособление, ще трябва да потвърдите, че това сте вие. Също така имайте предвид, че всеки ще вижда приспособленията дори когато таблетът ви е заключен. Възможно е някои от тях да не са предназначени за заключения екран и добавянето им на него може да е опасно."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Разбрах"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Приспособления"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"За да добавите приспособления към заключения екран като пряк път, уверете се, че са активирани в настройките."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Превключване между потребителите"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"падащо меню"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Всички приложения и данни в тази сесия ще бъдат изтрити."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Превключване към приложението вляво/отгоре в режима на разделен екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"При разделен екран: замяна на дадено приложение с друго"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Преместване на активния прозорец между екраните"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Преместване на прозореца наляво"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Преместване на прозореца надясно"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Увеличаване на прозореца"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Намаляване на прозореца"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Въвеждане"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Превключване към следващия език"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Превключване към предишния език"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Системни контроли"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Системни приложения"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Няколко задачи едновременно"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Скорошни приложения"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Разделен екран"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Въвеждане"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Преки пътища към приложения"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Клавишни комбинации"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Персонализиране на клавишните комбинации"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Да се премахне ли клавишната комбинация?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Натиснете клавиш, за да зададете клавишна комбинация"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Това ще изтрие персонализираната клавишна комбинация за постоянно."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Търсете клавишни комбинации"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Няма резултати от търсенето"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за свиване"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Икона на клавиша за действия или клавиша Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Икона на плюс"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Персонализиране"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за разгъване"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"или"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"плюс"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"наклонена черта"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Манипулатор за преместване с плъзгане"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Настройки на клавиатурата"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Задаване на клавишна комбинация"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Премахване"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Отказ"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Натиснете клавиш"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Клавишната комбинация вече се използва. Опитайте с друг клавиш."</string> diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml index edbf73e8f404..8f5effc01982 100644 --- a/packages/SystemUI/res/values-bn/strings.xml +++ b/packages/SystemUI/res/values-bn/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"উইজেট ব্যবহার করে কোনও অ্যাপ খুলতে, আপনাকে নিজের পরিচয় যাচাই করতে হবে। এছাড়াও, মনে রাখবেন, আপনার ট্যাবলেট লক থাকলেও যেকেউ তা দেখতে পারবেন। কিছু উইজেট আপনার লক স্ক্রিনের উদ্দেশ্যে তৈরি করা হয়নি এবং এখানে যোগ করা নিরাপদ নাও হতে পারে।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"বুঝেছি"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"উইজেট"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"শর্টকাট হিসেবে লক স্ক্রিনে উইজেট যোগ করলে, সেটি সেটিংস থেকে চালু আছে কিনা ভালো করে দেখে নিন।"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ব্যবহারকারী পাল্টে দিন"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"পুলডাউন মেনু"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"এই সেশনের সব অ্যাপ ও ডেটা মুছে ফেলা হবে।"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"স্প্লিট স্ক্রিন ব্যবহার করার সময় বাঁদিকের বা উপরের অ্যাপে পাল্টে নিন"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"\'স্প্লিট স্ক্রিন\' থাকাকালীন: একটি অ্যাপ থেকে অন্যটিতে পাল্টান"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"ডিসপ্লের মধ্যে একটি থেকে অপরটিতে অ্যাক্টিভ উইন্ডোটি সরান"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"উইন্ডো বাঁদিকে সরান"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"উইন্ডো ডানদিকে সরান"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"উইন্ডো বড় করুন"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"উইন্ডো ছোট করুন"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ইনপুট"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"পরবর্তী ভাষায় পাল্টান"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"আগের ভাষায় পাল্টান"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"সিস্টেম কন্ট্রোল"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"সিস্টেম অ্যাপ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"মাল্টিটাস্কিং"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"সম্প্রতি ব্যবহার করা অ্যাপ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"স্প্লিট স্ক্রিন"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ইনপুট"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"অ্যাপ শর্টকাট"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"কীবোর্ড শর্টকাট"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"কীবোর্ড শর্টকাট কাস্টমাইজ করুন"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"শর্টকাট সরাবেন?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"শর্টকাট অ্যাসাইন করতে কী প্রেস করুন"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"এটি আপনার কাস্টম শর্টকাট স্থায়ীভাবে মুছে ফেলবে।"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"শর্টকাট সার্চ করুন"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"কোনও সার্চ ফলাফল নেই"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"আইকন আড়াল করুন"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"অ্যাকশন বা মেটা কী আইকন"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"প্লাস আইকন"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"কাস্টমাইজ করুন"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"হয়ে গেছে"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"আইকন বড় করুন"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"অথবা"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"যোগ চিহ্ন"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ফরওয়ার্ড স্ল্যাশ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"টেনে আনার হ্যান্ডেল"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"কীবোর্ড সেটিংস"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"শর্টকাট সেট করুন"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"সরান"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"বাতিল করুন"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"কী প্রেস করুন"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"কী কম্বিনেশন আগে থেকে ব্যবহার হচ্ছে। অন্য কী ব্যবহার করে দেখুন।"</string> diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml index ab5ffaea94fd..0a88d447b202 100644 --- a/packages/SystemUI/res/values-bs/strings.xml +++ b/packages/SystemUI/res/values-bs/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Da otvorite aplikaciju pomoću vidžeta, morat ćete potvrditi identitet. Također imajte na umu da ih svako može pregledati, čak i ako je tablet zaključan. Neki vidžeti možda nisu namijenjeni za vaš zaključani ekran i njihovo dodavanje ovdje možda nije sigurno."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Razumijem"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Vidžeti"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Da dodate vidžete na zaključani ekran kao prečicu, provjerite je li ovo omogućeno u postavkama."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Zamijeni korisnika"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"padajući meni"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Sve aplikacije i podaci iz ove sesije će se izbrisati."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pređite u aplikaciju lijevo ili iznad dok koristite podijeljeni ekran"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Za vrijeme podijeljenog ekrana: zamjena jedne aplikacije drugom"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Premještanje aktivnog prozora između ekrana"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Pomicanje prozora ulijevo"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Pomicanje prozora udesno"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maksimiziranje prozora"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimiziranje prozora"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Unos"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Prebacivanje na sljedeći jezik"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Prebacivanje na prethodni jezik"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Sistemske kontrole"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Sistemske aplikacije"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nedavne aplikacije"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Podijeljeni ekran"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Unos"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Prečice aplikacije"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Prečice tastature"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prilagodite prečice na tastaturi"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Ukloniti prečicu?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Pritisnite tipku da dodijelite prečicu"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Ovo će trajno izbrisati prilagođenu prečicu."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prečica pretraživanja"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nema rezultata pretraživanja"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona sužavanja"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikona tipke radnji ili meta tipka"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikona znaka plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prilagođavanje"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona proširivanja"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ili"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"kosa crta"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ručica za prevlačenje"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Postavke tastature"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Postavi prečicu"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Ukloni"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Otkaži"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Pritisnite tipku"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Ta se kombinacija tipki već koristi. Pokušajte s drugom tipkom."</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 152e1adc72a9..614fe233c965 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Per obrir una aplicació utilitzant un widget, necessitaràs verificar la teva identitat. També has de tenir en compte que qualsevol persona pot veure els widgets, fins i tot quan la tauleta està bloquejada. És possible que alguns widgets no estiguin pensats per a la pantalla de bloqueig i que no sigui segur afegir-los-hi."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entesos"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Per afegir widgets a la pantalla de bloqueig com a drecera, assegura\'t que estiguin activats a la configuració."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Canvia d\'usuari"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menú desplegable"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Totes les aplicacions i les dades d\'aquesta sessió se suprimiran."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Canvia a l\'aplicació de l\'esquerra o de dalt amb la pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Durant el mode de pantalla dividida: substitueix una app per una altra"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Mou la finestra activa entre pantalles"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Mou la finestra cap a l\'esquerra"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Mou la finestra cap a la dreta"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximitza la finestra"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimitza la finestra"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Canvia a l\'idioma següent"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Caniva a l\'idioma anterior"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Controls del sistema"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Aplicacions del sistema"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasca"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Aplicacions recents"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Pantalla dividida"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Dreceres d\'aplicacions"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tecles de drecera"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalitza les tecles de drecera"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Vols suprimir la drecera?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Prem la tecla per assignar la drecera"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Aquesta acció suprimirà la drecera personalitzada permanentment."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Dreceres de cerca"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No hi ha cap resultat de la cerca"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Replega la icona"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Icona de la tecla d\'acció o Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Icona del signe més"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalitza"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Fet"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Desplega la icona"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"o"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"més"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barra inclinada"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ansa per arrossegar"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Configuració del teclat"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Configura la drecera"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Suprimeix"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancel·la"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Prem una tecla"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"La combinació de tecles ja s\'està utilitzant. Prova-ho amb una altra tecla."</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index ac0c6d66fc29..9d5a97a34bde 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"K otevření aplikace pomocí widgetu budete muset ověřit svou totožnost. Také mějte na paměti, že widgety uvidí kdokoli, i když tablet bude uzamčen. Některé widgety nemusí být pro obrazovku uzamčení určeny a nemusí být bezpečné je na ni přidat."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Rozumím"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgety"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Pokud chcete přidat Widgety na obrazovku uzamčení jako zkratku, musí to být povoleno v nastavení."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Přepnout uživatele"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"rozbalovací nabídka"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Veškeré aplikace a data v této relaci budou vymazána."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Přepnout na aplikaci vlevo nebo nahoře v režimu rozdělené obrazovky"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"V režimu rozdělené obrazovky: nahradit jednu aplikaci druhou"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Přesunout aktivní okno mezi obrazovkami"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Přesunout okno doleva"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Přesunout okno doprava"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximalizovat okno"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimalizovat okno"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Vstup"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Přepnout na další jazyk"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Přepnout na předchozí jazyk"</string> @@ -1391,7 +1390,7 @@ <string name="assistant_attention_content_description" msgid="4166330881435263596">"Je zjištěna přítomnost uživatele"</string> <string name="set_default_notes_app_toast_content" msgid="2812374329662610753">"Výchozí aplikaci pro poznámky nastavíte v Nastavení"</string> <string name="install_app" msgid="5066668100199613936">"Nainstalovat aplikaci"</string> - <string name="dismissible_keyguard_swipe" msgid="8377597870094949432">"Pokračujte přejetím"</string> + <string name="dismissible_keyguard_swipe" msgid="8377597870094949432">"Pokračovat přejetím nahoru"</string> <string name="connected_display_dialog_start_mirroring" msgid="6237895789920854982">"Zrcadlit na externí displej?"</string> <string name="connected_display_dialog_dual_display_stop_warning" msgid="4174707498892447947">"Vnitřní displej bude zrcadlen. Přední displej bude vypnutý."</string> <string name="mirror_display" msgid="2515262008898122928">"Zrcadlit displej"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Ovládací prvky systému"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Systémové aplikace"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Poslední aplikace"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Rozdělená obrazovka"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Vstup"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Zkratky aplikací"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klávesové zkratky"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Přizpůsobení klávesových zkratek"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Odstrabit zkratku?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Nastavte zkratku stisknutím klávesy"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Vlastní zkratka se trvale smaže."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Vyhledat zkratky"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Žádné výsledky hledání"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona sbalení"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikona klávesy Akce nebo Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikona Plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Přizpůsobit"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Hotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozbalení"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"nebo"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"lomítko"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Úchyt pro přetažení"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Nastavení klávesnice"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Nastavit zkratku"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Odstranit"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Zrušit"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Stiskněte klávesu"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Kombinace kláves se už používá. Použijte jinou klávesu."</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 968d44c6b597..53f34620c267 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Hvis du vil åbne en app ved hjælp af en widget, skal du verificere din identitet. Husk også, at alle kan se dem, også når din tablet er låst. Nogle widgets er muligvis ikke beregnet til låseskærmen, og det kan være usikkert at tilføje dem her."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Hvis du vil tilføje widgets på låseskærmen som en genvej, skal du sørge for, at funktionen er aktiveret i indstillingerne."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Skift bruger"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"rullemenu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Alle apps og data i denne session slettes."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Skift til en app til venstre eller ovenfor, når du bruger opdelt skærm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ved opdelt skærm: Udskift én app med en anden"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Flyt det aktive vindue fra skærm til skærm"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Flyt vinduet til venstre"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Flyt vinduet til højre"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maksimér vinduet"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimer vinduet"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Skift til næste sprog"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Skift til forrige sprog"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Systemstyring"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Systemapps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Seneste apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Opdelt skærm"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Appgenveje"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tastaturgenveje"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tilpas tastaturgenveje"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Skal genvejen fjernes?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Tryk på en tast for at tildele genvej"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Denne handling sletter din tilpassede genvej permanent."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Genveje til søgning"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Der er ingen søgeresultater"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikon for Skjul"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikon for handlingstast eller metatast"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plusikon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Tilpas"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Udfør"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikon for Udvid"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"eller"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"skråstreg"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Håndtag"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Tastaturindstillinger"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Konfigurer genvej"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Fjern"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Annuller"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Tryk på en tast"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Tastekombinationen er allerede i brug. Prøv en anden tast."</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 4994130ca5e4..e40445af0dbe 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Wenn du eine App mit einem Widget öffnen möchtest, musst du deine Identität bestätigen. Beachte auch, dass jeder die Widgets sehen kann, auch wenn dein Tablet gesperrt ist. Einige Widgets sind möglicherweise nicht für den Sperrbildschirm vorgesehen, sodass es unsicher sein kann, sie hier hinzuzufügen."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ok"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Wenn du die Funktion „Widgets auf dem Sperrbildschirm“ als Verknüpfung hinzufügen möchtest, musst du diese Funktion zuerst in den Einstellungen aktivieren."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Nutzer wechseln"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"Pull-down-Menü"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Alle Apps und Daten in dieser Sitzung werden gelöscht."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Im Splitscreen-Modus zu einer App links oder oben wechseln"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Im Splitscreen: eine App durch eine andere ersetzen"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Aktives Fenster auf anderes Display verschieben"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Fenster nach links verschieben"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Fenster nach rechts verschieben"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Fenster maximieren"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Fenster minimieren"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Eingabe"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Zur nächsten Sprache wechseln"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Zur vorherigen Sprache wechseln"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Systemsteuerelemente"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"System-Apps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Zuletzt verwendete Apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Splitscreen"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Eingabe"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-Verknüpfungen"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tastenkürzel"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tastenkombinationen anpassen"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Tastenkombination entfernen?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Drücke eine Taste, um eine Tastenkombination festzulegen"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Dadurch wird die benutzerdefinierte Tastenkombination endgültig gelöscht."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Tastenkürzel suchen"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Keine Suchergebnisse"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Symbol „Minimieren“"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Symbol für Aktions- oder Meta-Taste"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plussymbol"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Anpassen"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Fertig"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Symbol „Maximieren“"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"oder"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"Schrägstrich"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ziehpunkt"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Tastatureinstellungen"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Tastenkombination festlegen"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Entfernen"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Abbrechen"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Taste drücken"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Diese Tastenkombination wird bereits verwendet. Versuche es mit einer anderen Taste."</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 1e4ef8564d7e..43fa01a1e653 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Για να ανοίξετε μια εφαρμογή χρησιμοποιώντας ένα γραφικό στοιχείο, θα πρέπει να επαληθεύσετε την ταυτότητά σας. Επίσης, λάβετε υπόψη ότι η προβολή τους είναι δυνατή από οποιονδήποτε, ακόμα και όταν το tablet σας είναι κλειδωμένο. Ορισμένα γραφικά στοιχεία μπορεί να μην προορίζονται για την οθόνη κλειδώματος και η προσθήκη τους εδώ ενδέχεται να μην είναι ασφαλής."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Το κατάλαβα"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Για να προσθέσετε το Widgets στην οθόνη κλειδώματος ως συντόμευση, βεβαιωθείτε ότι είναι ενεργοποιημένο στις ρυθμίσεις."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Εναλλαγή χρήστη"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"αναπτυσσόμενο μενού"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Όλες οι εφαρμογές και τα δεδομένα αυτής της περιόδου σύνδεσης θα διαγραφούν."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Εναλλαγή σε εφαρμογή αριστερά ή επάνω κατά τη χρήση διαχωρισμού οθόνης"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Κατά τον διαχωρισμό οθόνης: αντικατάσταση μιας εφαρμογής με άλλη"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Μετακίνηση ενεργού παραθύρου μεταξύ οθονών"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Μετακίνηση παραθύρου αριστερά"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Μετακίνηση παραθύρου δεξιά"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Μεγιστοποίηση παραθύρου"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Ελαχιστοποίηση παραθύρου"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Είσοδος"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Εναλλαγή στην επόμενη γλώσσα"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Εναλλαγή στην προηγούμενη γλώσσα"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Στοιχεία ελέγχου συστήματος"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Εφαρμογές συστήματος"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Πολυδιεργασία"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Πρόσφατες εφαρμογές"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Διαχωρισμός οθόνης"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Εισαγωγή"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Συντομεύσεις εφαρμογών"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Συντομεύσεις πληκτρολογίου"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Προσαρμογή συντομεύσεων πληκτρολογίου"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Κατάργηση συντόμευσης;"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Πατήστε το πλήκτρο για ανάθεση της συντόμευσης"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Με αυτή την ενέργεια, η προσαρμοσμένη συντόμευση θα διαγραφεί οριστικά."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Συντομεύσεις αναζήτησης"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Κανένα αποτέλεσμα αναζήτησης"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Εικονίδιο σύμπτυξης"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Εικονίδιο πλήκτρου ενέργειας ή Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Εικονίδιο συν"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Προσαρμογή"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Τέλος"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Εικονίδιο ανάπτυξης"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ή"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"συν"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"κάθετος"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Λαβή μεταφοράς"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Ρυθμίσεις πληκτρολογίου"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Ορισμός συντόμευσης"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Κατάργηση"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Ακύρωση"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Πατήστε ένα πλήκτρο"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Ο συνδυασμός πλήκτρων χρησιμοποιείται ήδη. Δοκιμάστε άλλο πλήκτρο."</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 938caa14f945..d32c95acc5e6 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"To open an app using a widget, you\'ll need to verify that it\'s you. Also, bear in mind that anyone can view them, even when your tablet\'s locked. Some widgets may not have been intended for your lock screen and may be unsafe to add here."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Got it"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"To add widgets on the lock screen as a shortcut, make sure that it is enabled in settings."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Switch user"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"pulldown menu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"All apps and data in this session will be deleted."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Move active window between displays"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Move window to the left"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Move window to the right"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximise window"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimise window"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Switch to next language"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Switch to previous language"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"System controls"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"System apps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Recent apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Split screen"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App shortcuts"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Customise keyboard shortcuts"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Remove shortcut?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Press key to assign shortcut"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"This will delete your custom shortcut permanently."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No search results"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Action or Meta key icon"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plus icon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Customise"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Done"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"or"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"forward slash"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Drag handle"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Keyboard settings"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Set shortcut"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Remove"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancel"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Press key"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Key combination already in use. Try another key."</string> diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml index dada5e992f14..8a7420d9dd96 100644 --- a/packages/SystemUI/res/values-en-rCA/strings.xml +++ b/packages/SystemUI/res/values-en-rCA/strings.xml @@ -529,7 +529,8 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"To open an app using a widget, you’ll need to verify it’s you. Also, keep in mind that anyone can view them, even when your tablet’s locked. Some widgets may not have been intended for your lock screen and may be unsafe to add here."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Got it"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"To add Widgets on the lock screen as a shortcut, make sure it is enabled in settings."</string> + <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="599170482297578735">"To add the \"Widgets\" shortcut, make sure \"Show widgets on lock screen\" is enabled in settings."</string> + <string name="glanceable_hub_lockscreen_affordance_action_button_label" msgid="7636151133344609375">"Settings"</string> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Switch user"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"pulldown menu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"All apps and data in this session will be deleted."</string> @@ -1415,7 +1416,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"System controls"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"System apps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Recent apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Split screen"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App shortcuts"</string> @@ -1424,14 +1424,18 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Customize keyboard shortcuts"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Remove shortcut?"</string> + <string name="shortcut_customize_mode_reset_shortcut_dialog_title" msgid="8131184731313717780">"Reset back to default?"</string> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Press key to assign shortcut"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"This will delete your custom shortcut permanently."</string> + <string name="shortcut_customize_mode_reset_shortcut_description" msgid="2081849715634358684">"This will delete all your custom shortcuts permanently."</string> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No search results"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Action or Meta key icon"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plus icon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Customize"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Done"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"or"</string> @@ -1441,6 +1445,7 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Keyboard Settings"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Set shortcut"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Remove"</string> + <string name="shortcut_helper_customize_dialog_reset_button_label" msgid="7645535254306312685">"Yes, reset"</string> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancel"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Press key"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Key combination already in use. Try another key."</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 938caa14f945..d32c95acc5e6 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"To open an app using a widget, you\'ll need to verify that it\'s you. Also, bear in mind that anyone can view them, even when your tablet\'s locked. Some widgets may not have been intended for your lock screen and may be unsafe to add here."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Got it"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"To add widgets on the lock screen as a shortcut, make sure that it is enabled in settings."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Switch user"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"pulldown menu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"All apps and data in this session will be deleted."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Move active window between displays"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Move window to the left"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Move window to the right"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximise window"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimise window"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Switch to next language"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Switch to previous language"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"System controls"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"System apps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Recent apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Split screen"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App shortcuts"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Customise keyboard shortcuts"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Remove shortcut?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Press key to assign shortcut"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"This will delete your custom shortcut permanently."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No search results"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Action or Meta key icon"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plus icon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Customise"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Done"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"or"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"forward slash"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Drag handle"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Keyboard settings"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Set shortcut"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Remove"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancel"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Press key"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Key combination already in use. Try another key."</string> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 938caa14f945..d32c95acc5e6 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"To open an app using a widget, you\'ll need to verify that it\'s you. Also, bear in mind that anyone can view them, even when your tablet\'s locked. Some widgets may not have been intended for your lock screen and may be unsafe to add here."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Got it"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"To add widgets on the lock screen as a shortcut, make sure that it is enabled in settings."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Switch user"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"pulldown menu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"All apps and data in this session will be deleted."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Switch to the app on the left or above while using split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"During split screen: Replace an app from one to another"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Move active window between displays"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Move window to the left"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Move window to the right"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximise window"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimise window"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Switch to next language"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Switch to previous language"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"System controls"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"System apps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Recent apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Split screen"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App shortcuts"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Keyboard shortcuts"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Customise keyboard shortcuts"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Remove shortcut?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Press key to assign shortcut"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"This will delete your custom shortcut permanently."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Search shortcuts"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No search results"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Collapse icon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Action or Meta key icon"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plus icon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Customise"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Done"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Expand icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"or"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"forward slash"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Drag handle"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Keyboard settings"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Set shortcut"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Remove"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancel"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Press key"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Key combination already in use. Try another key."</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 5389aba2c2ac..711f771842e2 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -450,7 +450,7 @@ <string name="zen_modes_dialog_done" msgid="6654130880256438950">"Listo"</string> <string name="zen_modes_dialog_settings" msgid="2310248023728936697">"Configuración"</string> <string name="zen_mode_on" msgid="9085304934016242591">"Activado"</string> - <string name="zen_mode_on_with_details" msgid="7416143430557895497">"Sí • <xliff:g id="TRIGGER_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="zen_mode_on_with_details" msgid="7416143430557895497">"Activado • <xliff:g id="TRIGGER_DESCRIPTION">%1$s</xliff:g>"</string> <string name="zen_mode_off" msgid="1736604456618147306">"Desactivado"</string> <string name="zen_mode_set_up" msgid="8231201163894922821">"Sin establecer"</string> <string name="zen_mode_no_manual_invocation" msgid="1769975741344633672">"Administrar en configuración"</string> @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir una app usando un widget, debes verificar tu identidad. Además, ten en cuenta que cualquier persona podrá verlo, incluso cuando la tablet esté bloqueada. Es posible que algunos widgets no se hayan diseñados para la pantalla de bloqueo y podría ser peligroso agregarlos allí."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendido"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Para agregar Widgets en la pantalla de bloqueo como combinación de teclas, asegúrate de que la función esté habilitada en la configuración."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Cambiar usuario"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menú expandible"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Se eliminarán las aplicaciones y los datos de esta sesión."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Ubicar la app a la izquierda o arriba cuando usas la pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Durante pantalla dividida: Reemplaza una app con otra"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Mover la ventana activa de una pantalla a otra"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Mover la ventana hacia la izquierda"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Mover la ventana hacia la derecha"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximizar ventana"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizar ventana"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Cambiar al próximo idioma"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Cambiar al idioma anterior"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Controles del sistema"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Apps del sistema"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Tareas múltiples"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Apps recientes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Pantalla dividida"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Accesos directos a aplicaciones"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Combinaciones de teclas"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personaliza las combinaciones de teclas"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"¿Quieres quitar el acceso directo?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Presiona la tecla para asignar el acceso directo"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Esta acción borrará tu acceso directo personalizado de forma permanente."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Buscar combinaciones de teclas"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"La búsqueda no arrojó resultados"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícono de contraer"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ícono tecla meta o de acción"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"ícono de signo más"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Listo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícono de expandir"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"o"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"más"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barra diagonal"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Controlador de arrastre"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Configuración del teclado"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Establecer combinación de teclas"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Quitar"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancelar"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Presiona una tecla"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"La combinación de teclas ya está en uso. Prueba con otra."</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 2ff38b02e531..4a94cdfd0852 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir una aplicación usando un widget, deberás verificar que eres tú. Además, ten en cuenta que cualquier persona podrá verlos, incluso aunque tu tablet esté bloqueada. Es posible que algunos widgets no estén pensados para la pantalla de bloqueo y no sea seguro añadirlos aquí."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendido"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Para añadir la función de widgets en la pantalla de bloqueo como combinación de teclas, asegúrate de que la opción esté habilitada en los ajustes."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Cambiar de usuario"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menú desplegable"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Se eliminarán todas las aplicaciones y datos de esta sesión."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Cambiar a la app de la izquierda o de arriba en pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Con pantalla dividida: reemplazar una aplicación por otra"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Mover ventana activa de una pantalla a otra"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Mover ventana a la izquierda"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Mover ventana a la derecha"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximizar ventana"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizar ventana"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Cambiar a siguiente idioma"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Cambiar a idioma anterior"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Controles del sistema"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Aplicaciones del sistema"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitarea"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Aplicaciones recientes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Pantalla dividida"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Accesos directos a aplicaciones"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Combinaciones de teclas"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizar las combinaciones de teclas"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"¿Eliminar combinación de teclas?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Pulsa una tecla para asignar una combinación de teclas"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Se eliminará tu combinación de teclas personalizada de forma permanente."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Atajos de búsqueda"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"No hay resultados de búsqueda"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icono de contraer"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Icono de la tecla de acción o de la tecla Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Icono de más"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Hecho"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icono de desplegar"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"o"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"más"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barra inclinada"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Controlador de arrastre"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Ajustes del teclado"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Establecer combinación de teclas"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Eliminar"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancelar"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Pulsa una tecla"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"La combinación de teclas ya se está usando. Prueba con otra tecla."</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index f646e258535f..4027bbdd9ca1 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Rakenduse avamiseks vidina abil peate kinnitama, et see olete teie. Samuti pidage meeles, et kõik saavad vidinaid vaadata, isegi kui teie tahvelarvuti on lukus. Mõni vidin ei pruugi olla ette nähtud teie lukustuskuva jaoks ja seda pole turvaline siia lisada."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Selge"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Vidinad"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Selleks et lisada vidinad otseteena lukustuskuvale, veenduge, et see oleks seadetes lubatud."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Kasutaja vahetamine"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"rippmenüü"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Seansi kõik rakendused ja andmed kustutatakse."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Vasakule või ülemisele rakendusele lülitamine jagatud ekraani ajal"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ekraanikuva jagamise ajal: ühe rakenduse asendamine teisega"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Aktiivse akna teisaldamine ekraanide vahel"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Akna vasakule liigutamine"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Akna paremale liigutamine"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Akna maksimeerimine"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Akna minimeerimine"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Sisend"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Järgmisele keelele lülitamine"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Eelmisele keelele lülitamine"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Süsteemi juhtelemendid"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Süsteemirakendused"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitegumtöö"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Hiljutised rakendused"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Jagatud ekraanikuva"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Sisend"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Rakenduse otseteed"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klaviatuuri otseteed"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Klaviatuuri otseteede kohandamine"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Kas soovite otsetee eemaldada?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Otsetee lisamiseks vajutage klahvi"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"See kustutab teie kohandatud otsetee jäädavalt."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Otsige otseteid"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Otsingutulemused puuduvad"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ahendamisikoon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Toiming või metaklahv"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Pluss-ikoon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Kohandamine"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Valmis"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Laiendamisikoon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"või"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"pluss"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"kaldkriips"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Lohistamispide"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Klaviatuuri seaded"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Määrake otsetee"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Eemalda"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Tühista"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Vajutage klahvi"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Klahvikombinatsioon on juba kasutusel. Proovige mõnda muud klahvi."</string> diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml index 7d3c733ce58d..a0ba1b78a081 100644 --- a/packages/SystemUI/res/values-eu/strings.xml +++ b/packages/SystemUI/res/values-eu/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Aplikazio bat widget baten bidez irekitzeko, zeu zarela egiaztatu beharko duzu. Gainera, kontuan izan edonork ikusi ahalko dituela halako widgetak, tableta blokeatuta badago ere. Baliteke widget batzuk pantaila blokeaturako egokiak ez izatea, eta agian ez da segurua haiek bertan gehitzea."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ados"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgetak"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Pantaila blokeatuan lasterbide gisa widgetak gehitzeko, ziurtatu aukera hori gaituta dagoela ezarpenetan."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Aldatu erabiltzailea"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"zabaldu menua"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Saioko aplikazio eta datu guztiak ezabatuko dira."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Aldatu ezkerreko edo goiko aplikaziora pantaila zatitua erabiltzean"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Pantaila zatituan zaudela, ordeztu aplikazio bat beste batekin"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Eraman leiho aktiboa pantaila batetik bestera"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Eraman leihoa ezkerrera"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Eraman leihoa eskuinera"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximizatu leihoa"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizatu leihoa"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Sarrera"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Aldatu hurrengo hizkuntzara"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Aldatu aurreko hizkuntzara"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Sistema kontrolatzeko aukerak"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Sistemaren aplikazioak"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Zeregin bat baino gehiago aldi berean exekutatzea"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Azkenaldiko aplikazioak"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Pantaila zatitzea"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Sarrera"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Aplikazioetarako lasterbideak"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Lasterbideak"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Pertsonalizatu lasterbideak"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Lasterbidea kendu nahi duzu?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Sakatu tekla lasterbidea esleitzeko"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Betiko ezabatuko da lasterbide pertsonalizatua."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Bilatu lasterbideak"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ez dago bilaketa-emaitzarik"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Tolesteko ikonoa"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ekintzaren edo Meta teklaren ikonoa"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plus-ikonoa"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Pertsonalizatu"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Eginda"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Zabaltzeko ikonoa"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"edo"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"gehi"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barra"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Arrastatzeko kontrol-puntua"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Teklatuaren ezarpenak"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Ezarri lasterbidea"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Kendu"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Utzi"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Sakatu tekla"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Tekla-konbinazio hori erabili da dagoeneko. Probatu beste tekla bat."</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 153a460022a8..7bd01bc1a322 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"برای باز کردن برنامه بااستفاده از ابزاره، باید هویت خودتان را بهتأیید برسانید. همچنین، بهخاطر داشته باشید که همه میتوانند آنها را مشاهده کنند، حتی وقتی رایانه لوحیتان قفل است. برخیاز ابزارهها ممکن است برای صفحه قفل درنظر گرفته نشده باشند و ممکن است اضافه کردن آنها در اینجا ناامن باشد."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"متوجهام"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ابزارهها"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"برای افزودن «ابزارهها» در صفحه قفل بهعنوان میانبر، مطمئن شوید این گزینه در تنظیمات فعال باشد."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"تغییر کاربر"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"منوی پایینپر"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"همه برنامهها و دادههای این جلسه حذف خواهد شد."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"رفتن به برنامه سمت چپ یا بالا درحین استفاده از صفحهٔ دونیمه"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"درحین صفحهٔ دونیمه: برنامهای را با دیگری جابهجا میکند"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"جابهجا کردن پنجره فعال بین نمایشگرها"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"بردن پنجره به چپ"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"بردن پنجره به راست"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"بهحداکثر رساندن اندازه پنجره"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"بهحداقل رساندن اندازه پنجره"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ورودی"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"رفتن به زبان بعدی"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"رفتن به زبان قبلی"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"کنترلهای سیستم"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"برنامههای سیستم"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"چندوظیفگی"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"برنامههای اخیر"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"صفحهٔ دونیمه"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ورودی"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"میانبرهای برنامه"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"میانبرهای صفحهکلید"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"سفارشیسازی کردن میانبرهای صفحهکلید"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"میانبر حذف شود؟"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"برای اختصاص دادن میانبر، کلید را فشار دهید"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"با این کار، میانبر سفارشی شما برای همیشه حذف میشود."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"جستجوی میانبرها"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"نتیجهای برای جستجو پیدا نشد"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"نماد جمع کردن"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"نماد کلید کنش یا متا"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"نماد جمع"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"سفارشیسازی کردن"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"تمام"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"نماد ازهم بازکردن"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"یا"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"و"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"کجخط روبه جلو"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"دستگیره کشاندن"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"تنظیمات صفحهکلید"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"تنظیم میانبر"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"حذف"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"لغو"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"کلید را فشار دهید"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"ترکیب کلید ازقبل درحال استفاده است. کلید دیگری را امتحان کنید."</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 76d66c525256..e6174515c8d4 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Jos haluat avata sovelluksen käyttämällä widgetiä, sinun täytyy vahvistaa henkilöllisyytesi. Muista myös, että widgetit näkyvät kaikille, vaikka tabletti olisi lukittuna. Jotkin widgetit on ehkä tarkoitettu lukitusnäytölle, ja niiden lisääminen tänne ei välttämättä ole turvallista."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Selvä"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgetit"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Jos haluat lisätä Widgetit lukitusnäytöllä ‑ominaisuuden pikakuvakkeeksi, varmista, että se on otettu käyttöön asetuksissa."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Vaihda käyttäjää"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"alasvetovalikko"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Kaikki sovellukset ja tämän istunnon tiedot poistetaan."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Vaihda sovellukseen vasemmalla tai yläpuolella jaetussa näytössä"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Jaetun näytön aikana: korvaa sovellus toisella"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Siirrä aktiivinen ikkuna näytöltä toiselle"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Siirrä ikkuna vasemmalle"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Siirrä ikkuna oikealle"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Suurenna ikkuna"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Pienennä ikkuna"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Syöttötapa"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Vaihda seuraavaan kieleen"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Vaihda aiempaan kieleen"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Järjestelmän hallinta"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Järjestelmäsovellukset"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitaskaus"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Viimeisimmät sovellukset"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Jaettu näyttö"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Syöte"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Sovellusten pikakuvakkeet"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Pikanäppäimet"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Pikanäppäimien muokkaaminen"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Poistetaanko pikanäppäin?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Määritä pikanäppäin painamalla näppäintä"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Oma pikanäppäin poistetaan pysyvästi."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pikahaut"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ei hakutuloksia"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Tiivistyskuvake"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Toiminto- tai Meta-näppäinkuvake"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Pluskuvake"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Muokkaa"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Valmis"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Laajennuskuvake"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"tai"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"kauttaviiva"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Vetokahva"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Näppäimistön asetukset"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Valitse pikanäppäin"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Poista"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Peru"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Paina näppäintä"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Näppäinyhdistelmä on jo käytössä. Kokeile toista näppäintä."</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 6997b26b7c12..6213dd581b57 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Pour ouvrir une appli à l\'aide d\'un widget, vous devrez confirmer votre identité. En outre, gardez à l\'esprit que tout le monde peut voir les widgets, même lorsque votre tablette est verrouillée. Certains widgets n\'ont peut-être pas été conçus pour votre écran de verrouillage, et il pourrait être dangereux de les ajouter ici."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Pour ajouter des widgets comme raccourci à l\'écran de verrouillage, assurez-vous que cette fonctionnalité soit activée dans les paramètres."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Changer d\'utilisateur"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu déroulant"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Toutes les applis et les données de cette session seront supprimées."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Passer à l\'appli à gauche ou au-dessus avec l\'Écran divisé"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"En mode d\'écran divisé : remplacer une appli par une autre"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Déplacer la fenêtre active d\'un écran à l\'autre"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Déplacer la fenêtre vers la gauche"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Déplacer la fenêtre vers la droite"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Agrandir la fenêtre"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Réduire la fenêtre"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrée"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Passer à la langue suivante"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Passer à la langue précédente"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Commandes système"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Applis système"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitâche"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Applis récentes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Écran divisé"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrée"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Raccourcis des applis"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Raccourcis-clavier"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personnaliser les raccourcis-clavier"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Supprimer le raccourci?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Appuyez sur la touche pour attribuer un raccourci"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Cela supprimera définitivement votre raccourci personnalisé."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Rechercher des raccourcis"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Aucun résultat de recherche"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icône Réduire"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Icône de la touche Action ou Méta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Icône Plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personnaliser"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Terminé"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icône Développer"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barre oblique"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Poignée de déplacement"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Paramètres du clavier"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Définir un raccourci"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Supprimer"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Annuler"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Appuyez sur la touche"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"La combinaison de touches est déjà utilisée. Essayez une autre touche."</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 3e7fc389d5c2..d0931a687947 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Pour ouvrir une appli à l\'aide d\'un widget, vous devez confirmer qu\'il s\'agit bien de vous. N\'oubliez pas non plus que tout le monde peut voir vos widgets, même lorsque votre tablette est verrouillée. Certains d\'entre eux n\'ont pas été conçus pour l\'écran de verrouillage et les ajouter à cet endroit peut s\'avérer dangereux."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Pour ajouter des widgets à l\'écran de verrouillage en tant que raccourcis, assurez-vous que cette option est activée dans les paramètres."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Changer d\'utilisateur"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu déroulant"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Toutes les applications et les données de cette session seront supprimées."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Passez à l\'appli à gauche ou au-dessus avec l\'écran partagé"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"En mode écran partagé : Remplacer une appli par une autre"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Déplacer la fenêtre active d\'un écran à l\'autre"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Déplacer la fenêtre vers la gauche"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Déplacer la fenêtre vers la droite"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Agrandir la fenêtre"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Réduire la fenêtre"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Saisie"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Passer à la langue suivante"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Revenir à la langue précédente"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Commandes système"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Applis système"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitâche"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Applis récentes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Écran partagé"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrée"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Raccourcis d\'application"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Raccourcis clavier"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personnaliser les raccourcis clavier"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Supprimer le raccourci ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Appuyez sur une touche pour attribuer un raccourci"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Votre raccourci personnalisé sera définitivement supprimé."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Rechercher des raccourcis"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Aucun résultat de recherche"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icône Réduire"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Icône de touche d\'action ou de méta-touche"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Icône Plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personnaliser"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"OK"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icône Développer"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barre oblique"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Poignée de déplacement"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Paramètres du clavier"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Définir un raccourci"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Supprimer"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Annuler"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Appuyez sur la touche"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Combinaison de touches déjà utilisée. Essayez une autre touche."</string> diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml index d36a24dab815..a02206ddc1a5 100644 --- a/packages/SystemUI/res/values-gl/strings.xml +++ b/packages/SystemUI/res/values-gl/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir unha aplicación mediante un widget, tes que verificar a túa identidade. Ten en conta que pode velos calquera persoa, mesmo coa tableta bloqueada. Pode ser que algúns widgets non estean pensados para a túa pantalla de bloqueo, polo que talvez non sexa seguro engadilos aquí."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendido"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Para poderes engadir widgets á pantalla de bloqueo como atallos, debe estar activada na configuración a opción correspondente."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Cambiar usuario"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menú despregable"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Eliminaranse todas as aplicacións e datos desta sesión."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Cambiar á aplicación da esquerda ou de arriba coa pantalla dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"En modo de pantalla dividida: Substituír unha aplicación por outra"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Mover ventá activa entre pantallas"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Mover ventá á esquerda"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Mover ventá á dereita"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximizar ventá"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizar ventá"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Cambiar ao seguinte idioma"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Cambiar ao idioma anterior"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Controis do sistema"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Aplicacións do sistema"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitarefa"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Aplicacións recentes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Pantalla dividida"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Atallos de aplicacións"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Atallos de teclado"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizar os atallos de teclado"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Queres quitar o atallo?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Preme a tecla para asignar o atallo"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Eliminarase de forma permanente o teu atallo personalizado."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Busca atallos"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Non hai resultados de busca"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icona de contraer"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Icona da tecla Meta ou de acción"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Icona do signo máis"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Feito"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icona de despregar"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"máis"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barra oblicua"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Controlador de arrastre"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Configuración do teclado"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Definir atallo"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Quitar"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancelar"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Preme unha tecla"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Xa se está usando esta combinación de teclas. Proba con outra."</string> diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml index 1c528682e413..8cff7ff01eca 100644 --- a/packages/SystemUI/res/values-gu/strings.xml +++ b/packages/SystemUI/res/values-gu/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"વિજેટનો ઉપયોગ કરીને ઍપ ખોલવા માટે, તમારે એ ચકાસણી કરવાની જરૂર રહેશે કે આ તમે જ છો. તે ઉપરાંત, ધ્યાનમાં રાખો કે તમારું ટૅબ્લેટ લૉક કરેલું હોય તો પણ કોઈપણ વ્યક્તિ તેમને જોઈ શકે છે. અમુક વિજેટ કદાચ તમારી લૉક સ્ક્રીન માટે બનાવવામાં આવ્યા ન હોઈ શકે છે અને તેમને અહીં ઉમેરવાનું અસલામત હોઈ શકે છે."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"સમજાઈ ગયું"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"વિજેટ"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"લૉક સ્ક્રીન પર શૉર્ટકટ તરીકે વિજેટ ઉમેરવા માટે, ખાતરી કરો કે તે સેટિંગમાં ચાલુ કરેલા હોય."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"વપરાશકર્તા સ્વિચ કરો"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"પુલડાઉન મેનૂ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"આ સત્રમાંની તમામ ઍપ અને ડેટા કાઢી નાખવામાં આવશે."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"વિભાજિત સ્ક્રીનનો ઉપયોગ કરતી વખતે ડાબી બાજુની કે ઉપરની ઍપ પર સ્વિચ કરો"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"વિભાજિત સ્ક્રીન દરમિયાન: એક ઍપને બીજી ઍપમાં બદલો"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"સક્રિય વિન્ડોને ડિસ્પ્લેની વચ્ચે ખસેડો"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"વિંડોને ડાબી બાજુ ખસેડો"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"વિંડોને જમણી બાજુ ખસેડો"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"વિંડો મોટી કરો"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"વિંડો નાની કરો"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ઇનપુટ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"આગલી ભાષા પર સ્વિચ કરો"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"પાછલી ભાષા પર સ્વિચ કરો"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"સિસ્ટમના નિયંત્રણો"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"સિસ્ટમ ઍપ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"એકથી વધુ કાર્યો કરવા"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"તાજેતરની ઍપ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"સ્ક્રીનને વિભાજિત કરો"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ઇનપુટ"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ઍપ શૉર્ટકટ"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"કીબોર્ડ શૉર્ટકટ"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"કીબોર્ડ શૉર્ટકટને કસ્ટમાઇઝ કરો"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"શું શૉર્ટકટ કાઢી નાખીએ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"શૉર્ટકટ સોંપવા માટે કી દબાવો"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"આ તમારા કસ્ટમ શૉર્ટકટને કાયમી રીતે ડિલીટ કરશે."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"શૉર્ટકટ શોધો"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"કોઈ શોધ પરિણામો નથી"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"\'નાનું કરો\'નું આઇકન"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ઍક્શન અથવા મેટા કીનું આઇકન"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"પ્લસનું આઇકન"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"કસ્ટમાઇઝ કરો"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"થઈ ગયું"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"\'મોટું કરો\'નું આઇકન"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"અથવા"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"વત્તા"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ફૉરવર્ડ સ્લૅશ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ઑબ્જેક્ટ ખેંચવાનું હૅન્ડલ"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"કીબોર્ડના સેટિંગ"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"શૉર્ટકટ સેટ કરો"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"કાઢી નાખો"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"રદ કરો"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"કી દબાવો"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"કી સંયોજન પેહલેથી ઉપયોગમાં છે. અન્ય કી અજમાવી જુઓ."</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index fafb045c5b45..474014ce3cea 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"किसी विजेट से कोई ऐप्लिकेशन खोलने के लिए, आपको अपनी पहचान की पुष्टि करनी होगी. ध्यान रखें कि आपके टैबलेट के लॉक होने पर भी, कोई व्यक्ति विजेट देख सकता है. ऐसा हो सकता है कि कुछ विजेट, लॉक स्क्रीन पर दिखाने के लिए न बने हों. इन्हें लॉक स्क्रीन पर जोड़ना असुरक्षित हो सकता है."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ठीक है"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"विजेट"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"लॉक स्क्रीन पर शॉर्टकट के तौर पर विजेट जोड़ने के लिए, पक्का करें कि सेटिंग में यह सुविधा चालू हो."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"उपयोगकर्ता बदलें"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"पुलडाउन मेन्यू"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"इस सेशन के सभी ऐप्लिकेशन और डेटा को हटा दिया जाएगा."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"स्प्लिट स्क्रीन पर, बाईं ओर या ऊपर के ऐप पर स्विच करने के लिए"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"स्प्लिट स्क्रीन के दौरान: एक ऐप्लिकेशन को दूसरे ऐप्लिकेशन से बदलें"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"ऐक्टिव विंडो को एक से दूसरे डिसप्ले पर स्विच करें"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"विंडो को बाईं ओर ले जाएं"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"विंडो को दाईं ओर ले जाएं"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"विंडो को बड़ा करें"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"विंडो को छोटा करें"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"इनपुट"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"अगली भाषा पर स्विच करने के लिए"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"पिछली भाषा पर स्विच करने के लिए"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"सिस्टम से जुड़े कंट्रोल"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"सिस्टम के ऐप्लिकेशन"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"मल्टीटास्किंग (एक साथ कई काम करना)"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"हाल ही में इस्तेमाल किए गए ऐप्लिकेशन"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"स्प्लिट स्क्रीन"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"इनपुट"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ऐप शॉर्टकट"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"कीबोर्ड शॉर्टकट"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"कीबोर्ड शॉर्टकट को पसंद के मुताबिक बनाएं"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"क्या आपको शॉर्टकट हटाना है?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"शॉर्टकट असाइन करने के लिए बटन दबाएं"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ऐसा करने से, आपका कस्टम शॉर्टकट हमेशा के लिए मिट जाएगा."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"शॉर्टकट खोजें"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"खोज का कोई नतीजा नहीं मिला"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"छोटा करने का आइकॉन"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ऐक्शन या मेटा बटन का आइकॉन"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"प्लस का आइकॉन"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"पसंद के मुताबिक बनाएं"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"हो गया"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"बड़ा करने का आइकॉन"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"या"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"प्लस"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"फ़ॉरवर्ड स्लैश"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"खींचकर छोड़ने वाला हैंडल"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"कीबोर्ड सेटिंग"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"शॉर्टकट सेट करें"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"हटाएं"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"रद्द करें"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"बटन दबाएं"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"बटन का यह कॉम्बिनेशन पहले से इस्तेमाल किया जा रहा है. कोई दूसरा कॉम्बिनेशन आज़माएं."</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index d1be021d49e0..35996ea1c1c9 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Da biste otvorili aplikaciju pomoću widgeta, trebate potvrditi da ste to vi. Također napominjemo da ih svatko može vidjeti, čak i ako je vaš tablet zaključan. Neki widgeti možda nisu namijenjeni za zaključani zaslon, pa ih možda nije sigurno dodati ovdje."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Shvaćam"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgeti"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Da biste dodali widgete na zaključani zaslon kao prečac, provjerite jesu li omogućeni u postavkama."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Promjena korisnika"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"padajući izbornik"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Izbrisat će se sve aplikacije i podaci u ovoj sesiji."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Prelazak na aplikaciju slijeva ili iznad uz podijeljeni zaslon"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tijekom podijeljenog zaslona: zamijeni aplikaciju drugom"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Premještanje aktivnog prozora između zaslona"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Premještanje prozora ulijevo"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Premještanje prozora udesno"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maksimiziranje prozora"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimiziranje prozora"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Unos"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Prelazak na sljedeći jezik"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Prelazak na prethodni jezik"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Kontrole sustava"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Aplikacije sustava"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Obavljanje više zadataka"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nedavne aplikacije"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Podijeljeni zaslon"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Unos"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Prečaci aplikacija"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tipkovni prečaci"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prilagodba tipkovnih prečaca"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Želite li ukloniti prečac?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Pritisnite tipku da biste dodijelili prečac"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Time će se vaš prilagođeni prečac trajno izbrisati."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prečaci za pretraživanje"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nema rezultata pretraživanja"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za sažimanje"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikona tipke za radnju odnosno meta tipka"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikona plusa"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prilagodi"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za proširivanje"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ili"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"kosa crta"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Marker za povlačenje"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Postavke tipkovnice"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Postavite prečac"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Ukloni"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Odustani"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Pritisnite tipku"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Kombinacija tipki već se upotrebljava. Pokušajte s drugom tipkom."</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 4c5c36491359..c807aee30bb1 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Ha modul használatával szeretne megnyitni egy alkalmazást, igazolnia kell a személyazonosságát. Ne felejtse továbbá, hogy bárki megtekintheti a modulokat, még akkor is, amikor zárolva van a táblagép. Előfordulhat, hogy bizonyos modulokat nem a lezárási képernyőn való használatra terveztek, ezért nem biztonságos a hozzáadásuk."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Értem"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Modulok"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Ha szeretné gyorsparancsként hozzáadni a Modulok a lezárási képernyőn funkciót, győződjön meg arról, hogy a funkció engedélyezve van a beállításokban."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Felhasználóváltás"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"lehúzható menü"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"A munkamenetben található összes alkalmazás és adat törlődni fog."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Váltás a bal oldalt, illetve fent lévő appra osztott képernyő esetén"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Osztott képernyőn: az egyik alkalmazás lecserélése egy másikra"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Aktív ablak áthelyezése egyik kijelzőről a másikra"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Ablak balra mozgatása"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Ablak mozgatása jobbra"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Ablak teljes méretre állítása"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Ablak kis méretre állítása"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Bevitel"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Váltás a következő nyelvre"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Váltás az előző nyelvre"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Rendszervezérlők"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Rendszeralkalmazások"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Legutóbbi alkalmazások"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Osztott képernyő"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Bevitel"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Alkalmazásikonok"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Billentyűparancsok"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"A billentyűparancsok személyre szabása"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Eltávolítja a billentyűparancsot?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Nyomja meg a billentyűt a billentyűparancs hozzárendeléséhez"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Ezzel véglegesen törli az egyéni billentyűparancsot."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Billentyűparancsok keresése"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nincsenek keresési találatok"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Összecsukás ikon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Művelet vagy Meta billentyű ikonja"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Pluszikon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Személyre szabás"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Kész"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Kibontás ikon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"vagy"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plusz"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"törtvonal"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Fogópont"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Billentyűzetbeállítások"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Billentyűparancs beállítása"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Eltávolítás"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Mégse"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Nyomja le a billentyűt"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"A billentyűkombináció már használatban van. Próbálkozzon másik billentyűvel."</string> diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml index 065670098489..5603aff7f059 100644 --- a/packages/SystemUI/res/values-hy/strings.xml +++ b/packages/SystemUI/res/values-hy/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Վիջեթի միջոցով հավելված բացելու համար դուք պետք է հաստատեք ձեր ինքնությունը։ Նաև նկատի ունեցեք, որ ցանկացած ոք կարող է դիտել վիջեթները, նույնիսկ երբ ձեր պլանշետը կողպված է։ Որոշ վիջեթներ կարող են նախատեսված չլինել ձեր կողպէկրանի համար, և այստեղ դրանց ավելացնելը կարող է վտանգավոր լինել։"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Եղավ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Վիջեթներ"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Վիջեթները կողպէկրանին որպես դյուրանցում ավելացնելու համար համոզվեք, որ գործառույթը միացված է կարգավորումներում։"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Անջատել օգտվողին"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"իջնող ընտրացանկ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Այս աշխատաշրջանի բոլոր հավելվածներն ու տվյալները կջնջվեն:"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Անցեք աջ կողմի կամ վերևի հավելվածին տրոհված էկրանի միջոցով"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Տրոհված էկրանի ռեժիմում մեկ հավելվածը փոխարինել մյուսով"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Տեղափոխել ակտիվ պատուհանը էկրանների միջև"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Պատուհանը տեղափոխել ձախ"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Պատուհանը տեղափոխել աջ"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Ծավալել պատուհանը"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Ծալել պատուհանը"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Ներածում"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Անցնել հաջորդ լեզվին"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Անցնել նախորդ լեզվին"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Համակարգի կառավարման տարրեր"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Համակարգային հավելվածներ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Բազմախնդրություն"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Վերջին օգտագործած հավելվածները"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Տրոհված էկրան"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ներածում"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Հավելվածի դյուրանցումներ"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Ստեղնային դյուրանցումներ"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Կարգավորեք ստեղնային դյուրանցումներ"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Հեռացնե՞լ դյուրանցումը"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Սեղմեք որևէ ստեղն՝ դյուրանցում նշանակելու համար"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Ձեր հատուկ դյուրանցումն ընդմիշտ կջնջվի։"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Դյուրանցումների որոնում"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Որոնման արդյունքներ չկան"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ծալել պատկերակը"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Գործողության կամ Meta ստեղնի պատկերակ"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Պլյուս պատկերակ"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Կարգավորել"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Պատրաստ է"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ծավալել պատկերակը"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"կամ"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"գումարած"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"շեղ գիծ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Տեղափոխման նշիչ"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Ստեղնաշարի կարգավորումներ"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Ստեղծել դյուրանցում"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Հեռացնել"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Չեղարկել"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Սեղմեք որևէ ստեղն"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Ստեղների համակցությունն արդեն օգտագործվում է։ Ընտրեք այլ ստեղն։"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index da121671232b..3820ab749854 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Untuk membuka aplikasi menggunakan widget, Anda perlu memverifikasi diri Anda. Selain itu, harap ingat bahwa siapa saja dapat melihatnya, bahkan saat tablet Anda terkunci. Beberapa widget mungkin tidak dirancang untuk layar kunci Anda dan mungkin tidak aman untuk ditambahkan di sini."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Oke"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widget"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Untuk menambahkan Widget di layar kunci sebagai pintasan, pastikan Widget diaktifkan di setelan."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Beralih pengguna"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu pulldown"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Semua aplikasi dan data dalam sesi ini akan dihapus."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Beralih ke aplikasi di bagian kiri atau atas saat menggunakan layar terpisah"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Dalam layar terpisah: ganti salah satu aplikasi dengan yang lain"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Memindahkan jendela aktif dari satu layar ke layar lainnya"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Memindahkan jendela ke kiri"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Memindahkan jendela ke kanan"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Memaksimalkan jendela"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Meminimalkan jendela"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Beralih ke bahasa berikutnya"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Beralih ke bahasa sebelumnya"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Kontrol sistem"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Aplikasi sistem"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Aplikasi terbaru"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Layar terpisah"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Pintasan aplikasi"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Pintasan keyboard"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Menyesuaikan pintasan keyboard"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Hapus pintasan?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Tekan tombol untuk menetapkan pintasan"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Tindakan ini akan menghapus pintasan kustom Anda secara permanen."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Telusuri pintasan"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Tidak ada hasil penelusuran"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikon ciutkan"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikon tombol Tindakan atau Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikon plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Sesuaikan"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Selesai"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikon luaskan"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"atau"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"garis miring"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Handel geser"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Setelan Keyboard"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Setel pintasan"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Hapus"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Batal"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Tekan tombol"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Kombinasi tombol sudah digunakan. Coba tombol lain."</string> diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml index cee3ef4f6f5b..931c3dc172a3 100644 --- a/packages/SystemUI/res/values-is/strings.xml +++ b/packages/SystemUI/res/values-is/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Þú þarft að staðfesta að þetta sért þú til að geta opnað forrit með græju. Hafðu einnig í huga að hver sem er getur skoðað þær, jafnvel þótt spjaldtölvan sé læst. Sumar græjur eru hugsanlega ekki ætlaðar fyrir lásskjá og því gæti verið óöruggt að bæta þeim við hér."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ég skil"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Græjur"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Til að bæta „Græjur á lásskjá“ við sem flýtileið skaltu ganga úr skugga um að kveikt sé á eiginleikanum í stillingunum."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Skipta um notanda"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"Fellivalmynd"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Öllum forritum og gögnum í þessari lotu verður eytt."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Kerfisstýringar"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Kerfisforrit"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Fjölvinnsla"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nýleg forrit"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Skjáskipting"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Innsláttur"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Flýtileiðir forrita"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Flýtilyklar"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Sérsníddu flýtilykla"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Fjarlægja flýtileið?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Ýttu á lykil til að stilla flýtileið"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Þetta eyðir sérsniðnu flýtileiðinni varanlega."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Leita að flýtileiðum"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Engar leitarniðurstöður"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Minnka tákn"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Tákn lýsilykils (aðgerðarlykils)"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plústákn"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Sérsníða"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Lokið"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Stækka tákn"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"eða"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Stillingar lyklaborðs"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Stilltu flýtileið"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Fjarlægja"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Hætta við"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Ýttu á lykil"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Lyklasamsetningin er þegar í notkun. Prófaðu annan lykil."</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index bc6f262aa932..7c2fc4f5a0ed 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Per aprire un\'app utilizzando un widget, dovrai verificare la tua identità. Inoltre tieni presente che chiunque può vederlo, anche quando il tablet è bloccato. Alcuni widget potrebbero non essere stati progettati per la schermata di blocco e potrebbe non essere sicuro aggiungerli qui."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ok"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widget"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Per aggiungere Widget alla schermata di blocco come scorciatoia, assicurati che sia abilitata nelle impostazioni."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Cambio utente"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu a discesa"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Tutte le app e i dati di questa sessione verranno eliminati."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Controlli di sistema"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"App di sistema"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"App recenti"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Schermo diviso"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Scorciatoie app"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Scorciatoie da tastiera"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizza scorciatoie da tastiera"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Rimuovere scorciatoia?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Premi un tasto per assegnare una scorciatoia"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"La scorciatoia personalizzata verrà eliminata definitivamente."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Scorciatoie per la ricerca"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nessun risultato di ricerca"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icona Comprimi"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Icona tasto Azione o Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Icona Più"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizza"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Fine"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icona Espandi"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"oppure"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Impostazioni tastiera"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Imposta scorciatoia"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Rimuovi"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Annulla"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Premi un tasto"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Combinazione di tasti già in uso. Prova con un altro tasto."</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 31f3e4e469e9..e481a777c15a 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"כדי לפתוח אפליקציה באמצעות ווידג\'ט, עליך לאמת את זהותך. בנוסף, כדאי לזכור שכל אחד יכול לראות את הווידג\'טים גם כשהטאבלט שלך נעול. יכול להיות שחלק מהווידג\'טים לא נועדו למסך הנעילה ושלא בטוח להוסיף אותם לכאן."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"הבנתי"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ווידג\'טים"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"כדי להוסיף את קיצור דרך \"ווידג\'טים במסך הנעילה\", צריך לוודא שהתכונה הזו מופעלת בהגדרות."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"החלפת משתמש"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"תפריט במשיכה למטה"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"כל האפליקציות והנתונים בסשן הזה יימחקו."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"מעבר לאפליקציה מימין או למעלה בזמן שימוש במסך מפוצל"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"כשהמסך מפוצל: החלפה בין אפליקציה אחת לאחרת"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"העברת החלון הפעיל בין מסכים"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"העברת החלון שמאלה"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"העברת החלון ימינה"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"הגדלת החלון"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"מזעור החלון"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"קלט"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"מעבר לשפה הבאה"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"מעבר לשפה הקודמת"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"הגדרות המערכת"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"אפליקציות מערכת"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ריבוי משימות"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"אפליקציות שהיו בשימוש לאחרונה"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"מסך מפוצל"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"קלט"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"קיצורי דרך של אפליקציות"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"מקשי קיצור"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"התאמה אישית של מקשי הקיצור"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"להסיר את קיצור הדרך?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"צריך להקיש על מקש כדי להקצות מקש קיצור"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"קיצור הדרך יימחק באופן סופי."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"קיצורי דרך לחיפוש"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"אין תוצאות חיפוש"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"סמל הכיווץ"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"סמל מקש הפעולה (\"מטא\")"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"סמל הפלוס"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"התאמה אישית"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"סיום"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"סמל ההרחבה"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"או"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"סימן חיבור (פלוס)"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"קו נטוי"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"נקודת האחיזה לגרירה"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"הגדרות המקלדת"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"הגדרה של מקש קיצור"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"הסרה"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"ביטול"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"יש ללחוץ על מקש"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"שילוב המקשים הזה כבר בשימוש. אפשר לנסות מקש אחר."</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index d5fb1a783692..1a2d0225c44f 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ウィジェットを使用してアプリを起動するには、本人確認が必要です。タブレットがロックされた状態でも他のユーザーにウィジェットが表示されますので、注意してください。一部のウィジェットについてはロック画面での使用を想定していないため、ロック画面への追加は危険な場合があります。"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ウィジェット"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"ロック画面にウィジェットをショートカットとして追加するには、設定でウィジェットが有効になっていることをご確認ください。"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ユーザーを切り替える"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"プルダウン メニュー"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"このセッションでのアプリとデータはすべて削除されます。"</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"システム コントロール"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"システムアプリ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"マルチタスク"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"最近使ったアプリ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"分割画面"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"入力"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"アプリのショートカット"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"キーボード ショートカット"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"キーボード ショートカットをカスタマイズする"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"ショートカットを削除しますか？"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"ショートカットを割り当てるキーを押してください"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"この操作を行うと、カスタム ショートカットが完全に削除されます。"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"検索ショートカット"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"検索結果がありません"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"閉じるアイコン"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"アクションキーまたはメタキーのアイコン"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"プラスアイコン"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"カスタマイズ"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"完了"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"開くアイコン"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"または"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"キーボードの設定"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ショートカットの設定"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"削除"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"キャンセル"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"キーを押してください"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"このキーの組み合わせはすでに使用されています。別のキーを試してください。"</string> diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml index 8bbb1812c2cd..d7fe2845a520 100644 --- a/packages/SystemUI/res/values-ka/strings.xml +++ b/packages/SystemUI/res/values-ka/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"უნდა დაადასტუროთ თქვენი ვინაობა, რათა გახსნათ აპი ვიჯეტის გამოყენებით. გაითვალისწინეთ, რომ ნებისმიერს შეუძლია მათი ნახვა, მაშინაც კი, როცა ტაბლეტი დაბლოკილია. ზოგი ვიჯეტი შეიძლება არ იყოს გათვლილი თქვენი დაბლოკილი ეკრანისთვის და მათი აქ დამატება შეიძლება სახიფათო იყოს."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"გასაგებია"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ვიჯეტები"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"ჩაკეტილ ეკრანზე ვიჯეტის მალსახმობის სახით დასამატებლად დარწმუნდით, რომ ის ჩართულია პარამეტრებიდან."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"მომხმარებლის გადართვა"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ჩამოშლადი მენიუ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ამ სესიის ყველა აპი და მონაცემი წაიშლება."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"სისტემის მართვის საშუალებები"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"სისტემის აპები"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"მრავალამოცანიანი რეჟიმი"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"ბოლოდროინდელი აპები"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"ეკრანის გაყოფა"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"შეყვანა"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"აპის მალსახმობები"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"კლავიატურის მალსახმობები"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"კლავიატურის მალსახმობების მორგება"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"გსურთ მალსახმობის წაშლა?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"მალსახმობის მინიჭებისთვის დააჭირეთ კლავიშს"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ეს თქვენს მორგებულ მალსახმობებს სამუდამოდ წაშლის."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ძიების მალსახმობები"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ძიების შედეგები არ არის"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ხატულის ჩაკეცვა"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"მოქმედების ან მეტა კლავიშის ხატულა"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"პლუსის ხატულა"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"მორგება"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"მზადაა"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ხატულის გაფართოება"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ან"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"კლავიატურის პარამეტრები"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"მალსახმობის დაყენება"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"ამოშლა"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"გაუქმება"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"დააჭირეთ კლავიშს"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"კლავიშების კომბინაცია უკვე გამოიყენება. ცადეთ სხვა კლავიში."</string> diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml index 4f112933a76f..92269a2a2e73 100644 --- a/packages/SystemUI/res/values-kk/strings.xml +++ b/packages/SystemUI/res/values-kk/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Қолданбаны виджет көмегімен ашу үшін жеке басыңызды растауыңыз керек. Сондай-ақ басқалар оларды планшетіңіз құлыптаулы кезде де көре алатынын ескеріңіз. Кейбір виджеттер құлып экранына арналмаған болады, сондықтан оларды мұнда қосу қауіпсіз болмауы мүмкін."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Түсінікті"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Виджеттер"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"To add Widgets on the lock screen as a shortcut, make sure it is enabled in settings."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Пайдаланушыны ауыстыру"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ашылмалы мәзір"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Осы сеанстағы барлық қолданба мен дерек жойылады."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Бөлінген экранда сол не жоғары жақтағы қолданбаға ауысу"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Экранды бөлу кезінде: бір қолданбаны басқасымен алмастыру"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Дисплейлер арасында қосулы терезені ауыстыру"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Терезені сол жаққа жылжыту"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Терезені оң жаққа жылжыту"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Терезені ұлғайту"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Терезені кішірейту"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Енгізу"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Келесі тілге ауысу"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Алдыңғы тілге ауысу"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Жүйені басқару элементтері"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Жүйелік қолданбалар"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Мультитаскинг"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Соңғы қолданбалар"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Экранды бөлу"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Енгізу"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Қолданба таңбашалары"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Перне тіркесімдері"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Пернелер тіркесімін бейімдеу"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Жылдам пәрменді өшіру керек пе?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Жылдам пәрменді тағайындау үшін пернені басыңыз."</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Арнаулы жылдам пәрменіңіз біржола жойылады."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Іздеу жылдам пәрмендері"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Іздеу нәтижелері жоқ."</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Жию белгішесі"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Әрекет немесе Meta пернесінің белгішесі"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Қосу белгішесі"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Бейімдеу"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Дайын"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Жаю белгішесі"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"немесе"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"қосу"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"қиғаш сызық"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Сүйрейтін тетік"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Пернетақта параметрлері"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Жылдам пәрменді орнату"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Өшіру"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Бас тарту"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Пернені басыңыз"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Бұл пернелер тіркесімі қазір қолданыста. Басқа перне таңдаңыз."</string> diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml index 33aeb7028cd0..13153c61ab46 100644 --- a/packages/SystemUI/res/values-km/strings.xml +++ b/packages/SystemUI/res/values-km/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ដើម្បីបើកកម្មវិធីដោយប្រើធាតុក្រាហ្វិក អ្នកនឹងត្រូវផ្ទៀងផ្ទាត់ថាជាអ្នក។ ទន្ទឹមនឹងនេះ សូមចងចាំថា នរណាក៏អាចមើលធាតុក្រាហ្វិកបាន សូម្បីពេលថេប្លេតរបស់អ្នកជាប់សោក៏ដោយ។ ធាតុក្រាហ្វិកមួយចំនួនប្រហែលមិនត្រូវបានរចនាឡើងសម្រាប់អេក្រង់ចាក់សោរបស់អ្នកទេ និងមិនមានសុវត្ថិភាពឡើយ បើបញ្ចូលទៅទីនេះ។"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"យល់ហើយ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ធាតុក្រាហ្វិក"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"ដើម្បីបញ្ចូលធាតុក្រាហ្វិកនៅលើអេក្រង់ចាក់សោជាផ្លូវកាត់ សូមប្រាកដថាវាត្រូវបានបើកនៅក្នុងការកំណត់។"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ប្ដូរអ្នកប្រើ"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ម៉ឺនុយទាញចុះ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"កម្មវិធី និងទិន្នន័យទាំងអស់ក្នុងវគ្គនេះនឹងត្រូវលុប។"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ប្ដូរទៅកម្មវិធីនៅខាងឆ្វេង ឬខាងលើ ពេលកំពុងប្រើមុខងារបំបែកអេក្រង់"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ក្នុងអំឡុងពេលប្រើមុខងារបំបែកអេក្រង់៖ ជំនួសកម្មវិធីពីមួយទៅមួយទៀត"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"ផ្លាស់ទីវិនដូដែលសកម្មរវាងផ្ទាំងអេក្រង់"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"ផ្លាស់ទីវិនដូទៅឆ្វេង"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"ផ្លាស់ទីវិនដូទៅស្ដាំ"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"ពង្រីកវិនដូ"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"បង្រួមវិនដូ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"បញ្ចូល"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ប្ដូរទៅភាសាបន្ទាប់"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"ប្ដូរទៅភាសាមុន"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"ការគ្រប់គ្រងប្រព័ន្ធ"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"កម្មវិធីប្រព័ន្ធ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ការធ្វើកិច្ចការច្រើន"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"កម្មវិធីថ្មីៗ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"មុខងារបំបែកអេក្រង់"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ធាតុចូល"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ផ្លូវកាត់កម្មវិធី"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"ផ្លូវកាត់ក្ដារចុច"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ប្ដូរផ្លូវកាត់ក្ដារចុចតាមបំណង"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"ដកផ្លូវកាត់ចេញឬ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"ចុចគ្រាប់ចុច ដើម្បីកំណត់ផ្លូវកាត់"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ការធ្វើបែបនេះនឹងលុបផ្លូវកាត់ផ្ទាល់ខ្លួនរបស់អ្នកជាអចិន្ត្រៃយ៍។"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ស្វែងរកផ្លូវកាត់"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"គ្មានលទ្ធផលស្វែងរកទេ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"រូបតំណាង \"បង្រួម\""</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"រូបគ្រាប់ចុចសកម្មភាព ឬមេតា"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"រូបសញ្ញាបូក"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ប្ដូរតាមបំណង"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"រួចរាល់"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"រូបតំណាង \"ពង្រីក\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ឬ"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"បូក"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"សញ្ញា (/)"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ដងអូស"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"ការកំណត់ក្ដារចុច"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"កំណត់ផ្លូវកាត់"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"ដកចេញ"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"បោះបង់"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"ចុចគ្រាប់ចុច"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"កំពុងប្រើបន្សំគ្រាប់ចុចស្រាប់ហើយ។ សាកល្បងប្រើគ្រាប់ចុចផ្សេង។"</string> diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml index ee06f2340f73..b83e9576edca 100644 --- a/packages/SystemUI/res/values-kn/strings.xml +++ b/packages/SystemUI/res/values-kn/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ವಿಜೆಟ್ ಅನ್ನು ಬಳಸಿಕೊಂಡು ಆ್ಯಪ್ ತೆರೆಯಲು, ಇದು ನೀವೇ ಎಂದು ನೀವು ದೃಢೀಕರಿಸಬೇಕಾಗುತ್ತದೆ. ಅಲ್ಲದೆ, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಲಾಕ್ ಆಗಿದ್ದರೂ ಸಹ ಯಾರಾದರೂ ಅವುಗಳನ್ನು ವೀಕ್ಷಿಸಬಹುದು ಎಂಬುದನ್ನು ನೆನಪಿನಲ್ಲಿಡಿ. ಕೆಲವು ವಿಜೆಟ್ಗಳು ನಿಮ್ಮ ಲಾಕ್ ಸ್ಕ್ರೀನ್ಗಾಗಿ ಉದ್ದೇಶಿಸದೇ ಇರಬಹುದು ಮತ್ತು ಇಲ್ಲಿ ಸೇರಿಸುವುದು ಸುರಕ್ಷಿತವಲ್ಲದಿರಬಹುದು."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ಅರ್ಥವಾಯಿತು"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ವಿಜೆಟ್ಗಳು"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"ಶಾರ್ಟ್ಕಟ್ನಂತೆ ಲಾಕ್ ಸ್ಕ್ರೀನ್ನಲ್ಲಿ ವಿಜೆಟ್ಗಳನ್ನು ಸೇರಿಸಲು, ಅದನ್ನು ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆಯೇ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ಬಳಕೆದಾರರನ್ನು ಬದಲಿಸಿ"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ಪುಲ್ಡೌನ್ ಮೆನು"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ಈ ಸೆಶನ್ನಲ್ಲಿನ ಎಲ್ಲಾ ಆ್ಯಪ್ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"ಸಿಸ್ಟಂ ನಿಯಂತ್ರಣಗಳು"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"ಸಿಸ್ಟಂ ಆ್ಯಪ್ಗಳು"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ಮಲ್ಟಿಟಾಸ್ಕಿಂಗ್"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"ಇತ್ತೀಚಿನ ಆ್ಯಪ್ಗಳು"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"ಸ್ಪ್ಲಿಟ್ ಸ್ಕ್ರೀನ್"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ಇನ್ಪುಟ್"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ಆ್ಯಪ್ ಶಾರ್ಟ್ಕಟ್ಗಳು"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್ಕಟ್ಗಳು"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್ಕಟ್ಗಳನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"ಶಾರ್ಟ್ಕಟ್ ಅನ್ನು ತೆಗೆದುಹಾಕಬೇಕೇ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"ಶಾರ್ಟ್ಕಟ್ ಅನ್ನು ನಿಯೋಜಿಸಲು ಕೀಯನ್ನು ಒತ್ತಿರಿ"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ಇದು ನಿಮ್ಮ ಕಸ್ಟಮ್ ಶಾರ್ಟ್ಕಟ್ ಅನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸುತ್ತದೆ."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ಹುಡುಕಾಟದ ಶಾರ್ಟ್ಕಟ್ಗಳು"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ಯಾವುದೇ ಹುಡುಕಾಟ ಫಲಿತಾಂಶಗಳಿಲ್ಲ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ಕುಗ್ಗಿಸುವ ಐಕಾನ್"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ಆ್ಯಕ್ಷನ್ ಅಥವಾ ಮೆಟಾ ಕೀ ಐಕಾನ್"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"ಪ್ಲಸ್ ಐಕಾನ್"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ಕಸ್ಟಮೈಸ್ ಮಾಡಿ"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ಮುಗಿದಿದೆ"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ವಿಸ್ತೃತಗೊಳಿಸುವ ಐಕಾನ್"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ಅಥವಾ"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"ಕೀಬೋರ್ಡ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ಶಾರ್ಟ್ಕಟ್ ಸೆಟ್ ಮಾಡಿ"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"ತೆಗೆದುಹಾಕಿ"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"ರದ್ದುಮಾಡಿ"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"ಕೀ ಅನ್ನು ಒತ್ತಿರಿ"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"ಕೀ ಸಂಯೋಜನೆಯು ಈಗಾಗಲೇ ಬಳಕೆಯಲ್ಲಿದೆ. ಮತ್ತೊಂದು ಕೀ ಬಳಸಿ ನೋಡಿ."</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 6dcf92cfb0ba..00b2450881fd 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"위젯을 사용하여 앱을 열려면 본인 인증을 해야 합니다. 또한 태블릿이 잠겨 있더라도 누구나 볼 수 있다는 점을 유의해야 합니다. 일부 위젯은 잠금 화면에 적합하지 않고 여기에 추가하기에 안전하지 않을 수 있습니다."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"확인"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"위젯"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"잠금 화면에 위젯을 바로가기로 추가하려면 설정에서 위젯을 사용 설정하세요."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"사용자 전환"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"풀다운 메뉴"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"이 세션에 있는 모든 앱과 데이터가 삭제됩니다."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"화면 분할을 사용하는 중에 왼쪽 또는 위쪽에 있는 앱으로 전환하기"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"화면 분할 중: 다른 앱으로 바꾸기"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"디스플레이 간 활성 창 이동"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"창을 왼쪽으로 이동"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"창을 오른쪽으로 이동"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"창 최대화"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"창 최소화"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"입력"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"다음 언어로 전환"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"이전 언어로 전환"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"시스템 컨트롤"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"시스템 앱"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"멀티태스킹"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"최근 앱"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"화면 분할"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"입력"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"앱 단축키"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"단축키"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"단축키 맞춤설정"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"바로가기를 제거하시겠습니까?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"키를 눌러 단축키 지정"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"맞춤 단축어가 영구적으로 삭제됩니다."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"검색 바로가기"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"검색 결과 없음"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"접기 아이콘"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"작업 또는 메타 키 아이콘"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"더하기 아이콘"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"맞춤설정"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"완료"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"확장 아이콘"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"또는"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"더하기"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"슬래시"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"드래그 핸들"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"키보드 설정"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"단축키 설정"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"삭제"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"취소"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"키를 누르세요."</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"이미 사용 중인 키 조합입니다. 다른 키를 사용해 보세요."</string> diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml index 5a58507e46a5..a857f4ecb3b4 100644 --- a/packages/SystemUI/res/values-ky/strings.xml +++ b/packages/SystemUI/res/values-ky/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Колдонмону виджет аркылуу ачуу үчүн өзүңүздү ырасташыңыз керек. Алар кулпуланган планшетиңизде да көрүнүп турат. Кээ бир виджеттерди кулпуланган экранда колдоно албайсыз, андыктан аларды ал жерге кошпой эле койгонуңуз оң."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Түшүндүм"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Виджеттер"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"\"Кулпуланган экрандагы виджеттер\" функциясын ыкчам баскыч катары кошуу үчүн параметрлерге өтүп, анын иштетилгенин текшериңиз."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Колдонуучуну которуу"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ылдый түшүүчү меню"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Бул сеанстагы бардык колдонмолор жана аларга байланыштуу нерселер өчүрүлөт."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Системанын башкаруу элементтери"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Системанын колдонмолору"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Бир нече тапшырма аткаруу"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Акыркы колдонмолор"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Экранды бөлүү"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Киргизүү"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Колдонмонун ыкчам баскычтары"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Ыкчам баскычтар"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Ыкчам баскычтарды ыңгайлаштыруу"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Ыкчам баскыч өчүрүлсүнбү?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Ыкчам баскычты дайындоо үчүн баскычты басыңыз"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Ушуну менен жеке ыкчам баскычыңыз биротоло өчүрүлөт."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Ыкчам баскычтарды издөө"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Эч нерсе табылган жок"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Жыйыштыруу сүрөтчөсү"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Аракет же Мета ачкыч сүрөтчөсү"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Кошуу сүрөтчөсү"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Ыңгайлаштыруу"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Бүттү"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Жайып көрсөтүү сүрөтчөсү"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"же"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Баскычтоп параметрлери"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Ыкчам баскычты тууралоо"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Өчүрүү"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancel"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Баскычты басыңыз"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Ачкычтардын айкалышы колдонулууда. Башка ачкычты байкап көрүңүз."</string> diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml index 1cfd68ed3f81..19b216d6975c 100644 --- a/packages/SystemUI/res/values-lo/strings.xml +++ b/packages/SystemUI/res/values-lo/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ເພື່ອເປີດແອັບໂດຍໃຊ້ວິດເຈັດ, ທ່ານຈະຕ້ອງຢັ້ງຢືນວ່າແມ່ນທ່ານ. ນອກຈາກນັ້ນ, ກະລຸນາຮັບຊາບວ່າທຸກຄົນສາມາດເບິ່ງຂໍ້ມູນດັ່ງກ່າວໄດ້, ເຖິງແມ່ນວ່າແທັບເລັດຂອງທ່ານຈະລັອກຢູ່ກໍຕາມ. ວິດເຈັດບາງຢ່າງອາດບໍ່ໄດ້ມີໄວ້ສຳລັບໜ້າຈໍລັອກຂອງທ່ານ ແລະ ອາດບໍ່ປອດໄພທີ່ຈະເພີ່ມໃສ່ບ່ອນນີ້."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ເຂົ້າໃຈແລ້ວ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ວິດເຈັດ"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"ເພື່ອເພີ່ມວິດເຈັດຢູ່ໜ້າຈໍລັອກເປັນທາງລັດ, ໃຫ້ແນ່ໃຈວ່າມັນຖືກເປີດການນຳໃຊ້ໃນການຕັ້ງຄ່າ."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ສະຫຼັບຜູ້ໃຊ້"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ເມນູແບບດຶງລົງ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ແອັບຯແລະຂໍ້ມູນທັງໝົດໃນເຊດຊັນນີ້ຈະຖືກລຶບອອກ."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"ການຄວບຄຸມລະບົບ"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"ແອັບລະບົບ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ການເຮັດຫຼາຍໜ້າວຽກພ້ອມກັນ"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"ແອັບຫຼ້າສຸດ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"ແບ່ງໜ້າຈໍ"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ອິນພຸດ"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ທາງລັດແອັບ"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"ຄີລັດ"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ປັບແຕ່ງຄີລັດ"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"ລຶບທາງລັດອອກບໍ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"ກົດປຸ່ມເພື່ອກຳນົດທາງລັດ"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ການດຳເນີນການນີ້ຈະລຶບທາງລັດທີ່ກຳນົດເອງຂອງທ່ານຢ່າງຖາວອນ."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ທາງລັດການຊອກຫາ"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ບໍ່ມີຜົນການຊອກຫາ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ໄອຄອນຫຍໍ້ລົງ"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ໄອຄອນຄຳສັ່ງ ຫຼື ປຸ່ມ Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"ໄອຄອນໝາຍບວກ"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ປັບແຕ່ງ"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ແລ້ວໆ"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ໄອຄອນຂະຫຍາຍ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ຫຼື"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"ການຕັ້ງຄ່າແປ້ນພິມ"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ຕັ້ງທາງລັດ"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"ລຶບອອກ"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"ຍົກເລີກ"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"ກົດປຸ່ມ"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"ນໍາໃຊ້ປຸ່ມປະສົມຢູ່ແລ້ວ. ໃຫ້ລອງປຸ່ມອື່ນ."</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 3c81e37d1233..6d4c775ab143 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Kad galėtumėte atidaryti programą naudodami valdiklį, turėsite patvirtinti savo tapatybę. Be to, atminkite, kad bet kas gali peržiūrėti valdiklius net tada, kai planšetinis kompiuteris užrakintas. Kai kurie valdikliai gali būti neskirti jūsų užrakinimo ekranui ir gali būti nesaugu juos čia pridėti."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Supratau"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Valdikliai"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Jei norite pridėti valdiklių šaukinį užrakinimo ekrane, įsitikinkite, kad tai įgalinta nustatymuose."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Perjungti naudotoją"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"išplečiamasis meniu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Bus ištrintos visos šios sesijos programos ir duomenys."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Sistemos valdikliai"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Sistemos programos"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Kelių užduočių atlikimas"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Naujausios programos"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Išskaidyto ekrano režimas"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Įvestis"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Programos spartieji klavišai"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Spartieji klavišai"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Sparčiųjų klavišų tinkinimas"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Pašalinti spartųjį klavišą?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Paspauskite klavišą, kad priskirtumėte spartųjį klavišą"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Bus visam laikui ištrintas tinkintas spartusis klavišas."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Ieškoti sparčiųjų klavišų"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nėra jokių paieškos rezultatų"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Sutraukimo piktograma"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Veiksmo arba metaduomenų klavišo piktograma"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Pliuso piktograma"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Tinkinti"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Atlikta"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Išskleidimo piktograma"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"arba"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Klaviatūros nustatymai"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Nustatyti spartųjį klavišą"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Pašalinti"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Atšaukti"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Paspauskite klavišą"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Klavišų derinys jau naudojamas. Bandykite naudoti kitą klavišą."</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 5b553d9a58b6..d5229462285f 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Lai atvērtu lietotni, izmantojot logrīku, jums būs jāapstiprina sava identitāte. Turklāt ņemiet vērā, ka ikviens var skatīt logrīkus, pat ja planšetdators ir bloķēts. Iespējams, daži logrīki nav paredzēti izmantošanai bloķēšanas ekrānā, un var nebūt droši tos šeit pievienot."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Labi"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Logrīki"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Lai varētu pievienot funkciju “Logrīki bloķēšanas ekrānā” kā saīsni, iestatījumos noteikti iespējojiet šo funkciju."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Mainīt lietotāju"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"novelkamā izvēlne"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Tiks dzēstas visas šīs sesijas lietotnes un dati."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Pāriet uz lietotni pa kreisi/augšā, kamēr izmantojat sadalīto ekrānu."</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ekrāna sadalīšanas režīmā: pārvietot lietotni no viena ekrāna uz otru"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Pārvietot aktīvo logu starp displejiem"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Pārvietot logu pa kreisi"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Pārvietot logu pa labi"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maksimizēt logu"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizēt logu"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Ievade"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Pārslēgt uz nākamo valodu"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Pārslēgt uz iepriekšējo valodu"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Sistēmas vadīklas"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Sistēmas lietotnes"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Vairākuzdevumu režīms"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Pēdējās izmantotās lietotnes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Ekrāna sadalīšana"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ievade"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Lietotņu saīsnes"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Īsinājumtaustiņi"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Īsinājumtaustiņu pielāgošana"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Vai noņemt saīsni?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Lai piešķirtu īsinājumtaustiņu, nospiediet taustiņu"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Veicot šo darbību, jūsu pielāgotā saīsne tiks neatgriezeniski izdzēsta."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Meklēt saīsnes"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nav meklēšanas rezultātu"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Sakļaušanas ikona"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Darbību jeb meta taustiņa ikona"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Pluszīmes ikona"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Pielāgot"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gatavs"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Izvēršanas ikona"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"vai"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"uz priekšu vērstā slīpsvītra"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Vilkšanas turis"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Tastatūras iestatījumi"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Iestatīt īsinājumtaustiņu"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Noņemt"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Atcelt"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Nospiediet taustiņu"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Taustiņu kombinācija jau tiek izmantota. Izmēģiniet citu taustiņu."</string> diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml index 32ee791b376c..f991c1b68aac 100644 --- a/packages/SystemUI/res/values-mk/strings.xml +++ b/packages/SystemUI/res/values-mk/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"За да отворите апликација со помош на виџет, ќе треба да потврдите дека сте вие. Покрај тоа, имајте предвид дека секој може да ги гледа виџетите, дури и кога вашиот таблет е заклучен. Некои виџети можеби не се наменети за вашиот заклучен екран, па можеби не е безбедно да се додадат овде."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Сфатив"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Виџети"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"За да ја додадете „Виџети на заклучен екран“ како кратенка, проверете дали е овозможена во „Поставки“."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Промени го корисникот"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"паѓачко мени"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Сите апликации и податоци во сесијава ќе се избришат."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Префрлете се на апликацијата лево или горе при користењето поделен екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"При поделен екран: префрлете ги аплик. од едната на другата страна"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Движете го активниот прозорец меѓу екраните"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Премести го прозорецот налево"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Премести го прозорецот надесно"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Максимизирај го прозорецот"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Минимизирај го прозорецот"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Внесување"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Префрлете на следниот јазик"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Префрлете на претходниот јазик"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Системски контроли"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Системски апликации"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Мултитаскинг"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Неодамнешни апликации"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Поделен екран"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Внесување"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Кратенки за апликации"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Кратенки од тастатура"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Приспособете ги кратенките од тастатурата"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Да се отстрани кратенката?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Притиснете го копчето за да доделите кратенка"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Ова ќе ја избрише вашата приспособена кратенка трајно."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Пребарувајте кратенки"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Нема резултати од пребарување"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за собирање"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Икона за дејство или копче за дејство"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Икона плус"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Приспособете"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за проширување"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"или"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"плус"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"коса црта"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Рачка за влечење"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Поставки за тастатурата"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Поставете кратенка"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Отстрани"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Откажи"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Притиснете го копчето"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Комбинацијата на копчиња веќе се користи. Обидете се со друго копче."</string> diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml index ed6653170df6..784c896771d1 100644 --- a/packages/SystemUI/res/values-ml/strings.xml +++ b/packages/SystemUI/res/values-ml/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"വിജറ്റ് ഉപയോഗിച്ച് ഒരു ആപ്പ് തുറക്കാൻ, ഇത് നിങ്ങൾ തന്നെയാണെന്ന് പരിശോധിച്ചുറപ്പിക്കേണ്ടതുണ്ട്. നിങ്ങളുടെ ടാബ്ലെറ്റ് ലോക്കായിരിക്കുമ്പോഴും എല്ലാവർക്കും അത് കാണാനാകുമെന്നതും ഓർക്കുക. ചില വിജറ്റുകൾ നിങ്ങളുടെ ലോക്ക് സ്ക്രീനിന് ഉള്ളതായിരിക്കില്ല, അവ ഇവിടെ ചേർക്കുന്നത് സുരക്ഷിതവുമായിരിക്കില്ല."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"മനസ്സിലായി"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"വിജറ്റുകൾ"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"കുറുക്കുവഴിയായി ലോക്ക് സ്ക്രീനിൽ വിജറ്റുകൾ ചേർക്കാൻ, ക്രമീകരണത്തിൽ അത് പ്രവർത്തനക്ഷമമാക്കിയിട്ടുണ്ടെന്ന് ഉറപ്പാക്കുക."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ഉപയോക്താവ് മാറുക"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"പുൾഡൗൺ മെനു"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ഈ സെഷനിലെ എല്ലാ ആപ്പുകളും ഡാറ്റയും ഇല്ലാതാക്കും."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"സ്ക്രീൻ വിഭജന മോഡ് ഉപയോഗിക്കുമ്പോൾ ഇടതുവശത്തെ/മുകളിലെ ആപ്പിലേക്ക് മാറൂ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"സ്ക്രീൻ വിഭജന മോഡിൽ: ഒരു ആപ്പിൽ നിന്ന് മറ്റൊന്നിലേക്ക് മാറുക"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"സജീവ വിൻഡോകൾ ഡിസ്പ്ലേകൾക്ക് ഇടയിൽ നീക്കുക"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"വിൻഡോ ഇടത്തേക്ക് നീക്കുക"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"വിൻഡോ വലത്തേക്ക് നീക്കുക"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"വിൻഡോ വലുതാക്കുക"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"വിൻഡോ ചെറുതാക്കുക"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ഇൻപുട്ട്"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"അടുത്ത ഭാഷയിലേക്ക് മാറുക"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"മുമ്പത്തെ ഭാഷയിലേക്ക് മാറുക"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"സിസ്റ്റം നിയന്ത്രണങ്ങൾ"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"സിസ്റ്റം ആപ്പുകൾ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"മൾട്ടിടാസ്കിംഗ്"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"അടുത്തിടെ ഉപയോഗിച്ച ആപ്പുകൾ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"സ്ക്രീൻ വിഭജന മോഡ്"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ഇൻപുട്ട്"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ആപ്പ് കുറുക്കുവഴികൾ"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"കീബോഡ് കുറുക്കുവഴികൾ"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"കീബോർഡ് കുറുക്കുവഴികൾ ഇഷ്ടാനുസൃതമാക്കുക"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"കുറുക്കുവഴി നീക്കം ചെയ്യണോ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"കുറുക്കുവഴി അസൈൻ ചെയ്യാൻ കീ അമർത്തുക"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ഇത് നിങ്ങളുടെ ഇഷ്ടാനുസൃത കുറുക്കുവഴി ശാശ്വതമായി ഇല്ലാതാക്കും."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"തിരയൽ കുറുക്കുവഴികൾ"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"തിരയൽ ഫലങ്ങളൊന്നുമില്ല"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ചുരുക്കൽ ഐക്കൺ"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ആക്ഷൻ/മെറ്റാ കീ ഐക്കൺ"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"പ്ലസ് ഐക്കൺ"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ഇഷ്ടാനുസൃതമാക്കുക"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"പൂർത്തിയായി"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"വികസിപ്പിക്കൽ ഐക്കൺ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"അല്ലെങ്കിൽ"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"പ്ലസ്"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ഫോർവേഡ് സ്ലാഷ്"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"വലിച്ചിടുന്നതിനുള്ള ഹാൻഡിൽ"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"കീബോർഡ് ക്രമീകരണം"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"കുറുക്കുവഴി സജ്ജീകരിക്കുക"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"നീക്കം ചെയ്യുക"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"റദ്ദാക്കുക"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"കീ അമർത്തുക"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"കീ കോമ്പിനേഷൻ ഇതിനകം ഉപയോഗത്തിലുണ്ട്. മറ്റൊരു കീ പരീക്ഷിക്കുക."</string> diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml index f2863d098675..6e60b718a6a1 100644 --- a/packages/SystemUI/res/values-mn/strings.xml +++ b/packages/SystemUI/res/values-mn/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Виджет ашиглан аппыг нээхийн тулд та өөрийгөө мөн болохыг баталгаажуулах шаардлагатай болно. Мөн таны таблет түгжээтэй байсан ч тэдгээрийг дурын хүн үзэж болохыг санаарай. Зарим виджет таны түгжээтэй дэлгэцэд зориулагдаагүй байж магадгүй ба энд нэмэхэд аюултай байж болзошгүй."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ойлголоо"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Виджет"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Түгжээтэй дэлгэц дээр товчлол байдлаар виджет нэмэхийн тулд тохиргоонд виджетийг идэвхжүүлсэн эсэхийг нягтална уу."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Хэрэглэгчийг сэлгэх"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"эвхмэл цэс"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Энэ харилцан үйлдлийн бүх апп болон дата устах болно."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Дэлгэц хуваахыг ашиглаж байхдаа зүүн талд эсвэл дээр байх апп руу сэлгэ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Дэлгэц хуваах үеэр: аппыг нэгээс нөгөөгөөр солих"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Идэвхтэй цонхыг дэлгэц хооронд зөөх"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Цонхыг зүүн тийш зөөх"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Цонхыг баруун тийш зөөх"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Цонхыг томруулах"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Цонхыг багасгах"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Оролт"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Дараагийн хэл рүү сэлгэх"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Өмнөх хэл рүү сэлгэх"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Системийн тохиргоо"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Системийн аппууд"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Олон ажил зэрэг хийх"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Саяхны аппууд"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Дэлгэцийг хуваах"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Оролт"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Аппын товчлол"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Товчлуурын шууд холбоос"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Товчлуурын шууд холбоосыг өөрчлөх"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Товчлолыг хасах уу?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Товчлол оноохын тулд товч дарна уу"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Энэ нь таны захиалгат товчлолыг бүрмөсөн устгана."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Товчлолууд хайх"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ямар ч хайлтын илэрц байхгүй"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Хураах дүрс тэмдэг"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Үйлдлийн товч буюу өөрөөр Мета товчийн дүрс тэмдэг"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Нэмэх дүрс тэмдэг"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Өөрчлөх"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Болсон"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Дэлгэх дүрс тэмдэг"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"эсвэл"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"нэмэх нь"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"урагшаа ташуу зураас"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Чирэх бариул"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Гарын тохиргоо"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Товчлол тохируулах"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Хасах"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Цуцлах"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Товч дарна уу"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Товчийн хослолыг аль хэдийн ашиглаж байна. Өөр товч туршиж үзнэ үү."</string> diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml index 35ee42f838ef..c21a666026af 100644 --- a/packages/SystemUI/res/values-mr/strings.xml +++ b/packages/SystemUI/res/values-mr/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"विजेट वापरून अॅप उघडण्यासाठी, तुम्हाला हे तुम्हीच असल्याची पडताळणी करावी लागेल. तसेच, लक्षात ठेवा, तुमचा टॅबलेट लॉक असतानादेखील कोणीही ती पाहू शकते. काही विजेट कदाचित तुमच्या लॉक स्क्रीनसाठी नाहीत आणि ती इथे जोडणे असुरक्षित असू शकते."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"समजले"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"विजेट"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"विजेट शॉर्टकट म्हणून लॉक स्क्रीनवर जोडण्यासाठी, सेटिंग्जमध्ये ती सुरू असल्याची खात्री करा."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"वापरकर्ता स्विच करा"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"पुलडाउन मेनू"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"या सत्रातील सर्व अॅप्स आणि डेटा हटवला जाईल."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"सिस्टीमची नियंत्रणे"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"सिस्टीम अॅप्स"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"मल्टिटास्किंग"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"अलीकडील अॅप्स"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"स्प्लिट स्क्रीन"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"इनपुट"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"अॅप शॉर्टकट"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"कीबोर्ड शॉर्टकट"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"कीबोर्ड शॉर्टकट कस्टमाइझ करा"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"शॉर्टकट काढून टाकायचा आहे का?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"शॉर्टकट असाइन करण्यासाठी की प्रेस करा"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"यामुळे तुमचा कस्टम शॉर्टकट कायमचा हटवला जाईल."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"शोधण्यासाठी शॉर्टकट"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"कोणतेही शोध परिणाम नाहीत"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"कोलॅप्स करा आयकन"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"कृती किंवा मेटा की आयकन"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"अधिक आयकन"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"कस्टमाइझ करा"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"पूर्ण झाले"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"विस्तार करा आयकन"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"किंवा"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"कीबोर्ड सेटिंग्ज"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"शॉर्टकट सेट करा"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"काढून टाका"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"रद्द करा"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"की प्रेस करा"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"की कॉम्बिनेशन आधीपासून वापरले जात आहे. दुसरी की वापरून पहा."</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index cfb95a2b7908..62f85a5e9fb2 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Untuk membuka apl menggunakan widget, anda perlu mengesahkan identiti anda. Selain itu, perlu diingat bahawa sesiapa sahaja boleh melihat widget tersebut, walaupun semasa tablet anda dikunci. Sesetengah widget mungkin tidak sesuai untuk skrin kunci anda dan mungkin tidak selamat untuk ditambahkan di sini."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widget"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Untuk menambahkan Widget pada skrin kunci sebagai pintasan, pastikan skrin kunci itu didayakan dalam tetapan."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Tukar pengguna"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu tarik turun"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Semua apl dan data dalam sesi ini akan dipadam."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Tukar kepada apl di sebelah kiri/atas semasa menggunakan skrin pisah"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Semasa skrin pisah: gantikan apl daripada satu apl kepada apl lain"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Alihkan tetingkap aktif antara paparan"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Alihkan tetingkap ke sebelah kiri"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Alihkan tetingkap ke sebelah kanan"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maksimumkan tetingkap"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimumkan tetingkap"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Beralih kepada bahasa seterusnya"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Beralih kepada bahasa sebelumnya"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Kawalan sistem"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Apl sistem"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Berbilang tugas"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Apl terbaharu"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Skrin pisah"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Pintasan apl"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Pintasan papan kekunci"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Sesuaikan pintasan papan kekunci"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Alih keluar pintasan?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Tekan kekunci untuk menetapkan pintasan"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Tindakan ini akan memadamkan pintasan tersuai anda secara kekal."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pintasan carian"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Tiada hasil carian"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Kuncupkan ikon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikon kekunci tindakan atau Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikon tambah"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Sesuaikan"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Selesai"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Kembangkan ikon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"atau"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"tambah"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"garis condong ke hadapan"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Pemegang seret"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Tetapan Papan Kekunci"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Tetapkan pintasan"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Alih keluar"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Batal"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Tekan kekunci"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Gabungan kekunci sudah digunakan. Cuba kekunci lain."</string> diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml index 8cce3718a571..393f2f2dd46b 100644 --- a/packages/SystemUI/res/values-my/strings.xml +++ b/packages/SystemUI/res/values-my/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ဝိဂျက်သုံး၍ အက်ပ်ဖွင့်ရန်အတွက် သင်ဖြစ်ကြောင်း အတည်ပြုရန်လိုသည်။ ထို့ပြင် သင့်တက်ဘလက် လော့ခ်ချထားချိန်၌ပင် မည်သူမဆို ၎င်းတို့ကို ကြည့်နိုင်ကြောင်း သတိပြုပါ။ ဝိဂျက်အချို့ကို လော့ခ်မျက်နှာပြင်အတွက် ရည်ရွယ်ထားခြင်း မရှိသဖြင့် ဤနေရာတွင် ထည့်ပါက မလုံခြုံနိုင်ပါ။"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"နားလည်ပြီ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ဝိဂျက်များ"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"လော့ခ်မျက်နှာပြင်တွင် ဖြတ်လမ်းလင့်ခ်အဖြစ် ‘ဝိဂျက်များ’ ထည့်ရန် ၎င်းကို ဆက်တင်များတွင်ဖွင့်ထားကြောင်း သေချာပါစေ။"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"အသုံးပြုသူကို ပြောင်းလဲရန်"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ဆွဲချမီနူး"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ဒီချိတ်ဆက်မှု ထဲက အက်ပ်များ အားလုံး နှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"မျက်နှာပြင် ခွဲ၍ပြသခြင်းသုံးစဉ် ဘယ် (သို့) အထက်ရှိအက်ပ်သို့ ပြောင်းရန်"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"မျက်နှာပြင် ခွဲ၍ပြသစဉ်- အက်ပ်တစ်ခုကို နောက်တစ်ခုနှင့် အစားထိုးရန်"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"လက်ရှိဝင်းဒိုးကို ပြကွက်များအကြား ရွှေ့ခြင်း"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"ဝင်းဒိုးကို ဘယ်ဘက်ရွှေ့ရန်"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"ဝင်းဒိုးကို ညာဘက်ရွှေ့ရန်"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"ဝင်ဒိုးကို ချဲ့ရန်"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"ဝင်းဒိုးကို ချုံ့ရန်"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"စာရိုက်ခြင်း"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"နောက်ဘာသာစကားသို့ ပြောင်းရန်"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"ယခင်ဘာသာစကားသို့ ပြောင်းရန်"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"စနစ် ထိန်းချုပ်မှုများ"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"စနစ် အက်ပ်များ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"တစ်ပြိုင်နက် များစွာလုပ်ခြင်း"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"မကြာသေးမီက အက်ပ်များ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"မျက်နှာပြင် ခွဲ၍ပြသခြင်း"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ထည့်သွင်းမှု"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"အက်ပ်ဖြတ်လမ်းလင့်ခ်များ"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"လက်ကွက်ဖြတ်လမ်းများ"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"လက်ကွက်ဖြတ်လမ်းများကို စိတ်ကြိုက်လုပ်ခြင်း"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"ဖြတ်လမ်းလင့်ခ် ဖယ်ရှားမလား။"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"ဖြတ်လမ်းလင့်ခ်သတ်မှတ်ရန် ကီးကို နှိပ်ပါ"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"၎င်းသည် သင့်စိတ်ကြိုက် ဖြတ်လမ်းလင့်ခ်ကို အပြီးဖျက်ပါမည်။"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ဖြတ်လမ်းများ ရှာရန်"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ရှာဖွေမှုရလဒ် မရှိပါ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"လျှော့ပြရန် သင်္ကေတ"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"လုပ်ဆောင်ချက် (သို့) Meta ကီးသင်္ကေတ"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"အပေါင်းသင်္ကေတ"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"စိတ်ကြိုက်လုပ်ရန်"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ပြီးပြီ"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ပိုပြရန် သင်္ကေတ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"သို့မဟုတ်"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"အပေါင်း"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ညာဘက်မျဉ်းစောင်း"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ဖိဆွဲအထိန်း"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"ကီးဘုတ်ဆက်တင်များ"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ဖြတ်လမ်း သတ်မှတ်ရန်"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"ဖယ်ရှားရန်"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"မလုပ်တော့"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"ကီးကို နှိပ်ပါ"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"ကီးပေါင်းစပ်ခြင်းကို သုံးနေပြီးဖြစ်သည်။ အခြားကီးကို စမ်းကြည့်ပါ။"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index c863d19ca393..7454d632ee3a 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"For å åpne en app ved hjelp av en modul må du bekrefte at det er deg. Husk også at hvem som helst kan se dem, selv om nettbrettet er låst. Noen moduler er kanskje ikke laget for å være på låseskjermen og kan være utrygge å legge til der."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Greit"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Moduler"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"For å legge til moduler på låseskjermen som en snarvei, sørg for at de er slått på i innstillingene."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Bytt bruker"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"rullegardinmeny"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Alle apper og data i denne økten blir slettet."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bytt til appen til venstre eller over mens du bruker delt skjerm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"I delt skjerm: Bytt ut en app"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Flytt det aktive vinduet mellom skjermer"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Flytt vinduet til venstre"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Flytt vinduet til høyre"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maksimer vinduet"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimerer vinduet"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Skrivespråk"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Bytt til neste språk"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Bytt til forrige språk"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Systemkontroller"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Systemapper"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nylige apper"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Delt skjerm"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Inndata"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-snarveier"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Hurtigtaster"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tilpass hurtigtastene"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Vil du fjerne hurtigtasten?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Trykk på en tast for å tilordne hurtigtasten"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Dette fører til at den egendefinerte hurtigtasten slettes permanent."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Snarveier til søk"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ingen søkeresultater"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Skjul-ikon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Handlings- eller Meta-tast-ikon"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plussikon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Tilpass"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Ferdig"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Vis-ikon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"eller"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"pluss"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"skråstrek"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Håndtak"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Tastaturinnstillinger"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Angi hurtigtast"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Fjern"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Avbryt"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Trykk på tasten"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Tastekombinasjonen brukes allerede. Prøv en annen tast."</string> diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml index 681e32884a44..9b8af93ab0d6 100644 --- a/packages/SystemUI/res/values-ne/strings.xml +++ b/packages/SystemUI/res/values-ne/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"विजेट प्रयोग गरी एप खोल्न तपाईंले आफ्नो पहिचान पुष्टि गर्नु पर्ने हुन्छ। साथै, तपाईंको ट्याब्लेट लक भएका बेला पनि सबै जनाले तिनलाई देख्न सक्छन् भन्ने कुरा ख्याल गर्नुहोस्। केही विजेटहरू लक स्क्रिनमा प्रयोग गर्ने उद्देश्यले नबनाइएका हुन सक्छन् र तिनलाई यहाँ हाल्नु सुरक्षित नहुन सक्छ।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"बुझेँ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"विजेटहरू"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"विजेटहरू लक स्क्रिनमा सर्टकटका रूपमा हाल्न सेटिङमा गई यो सुविधा अन गरिएको छ भन्ने सुनिश्चित गर्नुहोस्।"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"प्रयोगकर्ता फेर्नुहोस्"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"पुलडाउन मेनु"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"यो सत्रमा भएका सबै एपहरू र डेटा मेटाइने छ।"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"स्प्लिट स्क्रिन प्रयोग गर्दै गर्दा बायाँ वा माथिको एप चलाउनुहोस्"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"स्प्लिट स्क्रिन प्रयोग गरिएका बेला: एउटा स्क्रिनमा भएको एप अर्कोमा लैजानुहोस्"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"सक्रिय विन्डोलाई एउटा डिस्प्लेबाट सारेर अर्को डिस्प्लेमा लैजानुहोस्"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"विन्डो सारेर बायाँतिर लैजानुहोस्"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"विन्डो सारेर दायाँतिर लैजानुहोस्"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"विन्डो म्याक्सिमाइज गर्नुहोस्"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"विन्डो मिनिमाइज गर्नुहोस्"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"इनपुट"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"अर्को भाषा प्रयोग गर्नुहोस्"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"अघिल्लो भाषा प्रयोग गर्नुहोस्"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"सिस्टमसँग सम्बन्धित नियन्त्रणहरू"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"सिस्टम एपहरू"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"एकै पटक एकभन्दा बढी एप चलाउन मिल्ने सुविधा"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"हालसालै चलाइएका एपहरू"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"स्प्लिट स्क्रिन"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"इनपुट"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"एपका सर्टकटहरू"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"किबोर्डका सर्टकटहरू"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"किबोर्डका सर्टकटहरू कस्टमाइज गर्नुहोस्"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"सर्टकट हटाउने हो?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"सर्टकट असाइन गर्न की थिच्नुहोस्"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"यसो गर्नुभयो भने तपाईंको कस्टम सर्टकट सदाका लागि मेटिने छ।"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"खोजका सर्टकटहरू"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"कुनै पनि खोज परिणाम भेटिएन"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"\"कोल्याप्स गर्नुहोस्\" आइकन"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"एक्सन वा Meta कीको आइकन"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"प्लस आइकन"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"कस्टमाइज गर्नुहोस्"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"पूरा भयो"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"\"एक्स्पान्ड गर्नुहोस्\" आइकन"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"वा"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"प्लस"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"फर्वार्ड स्ल्यास"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ड्र्याग ह्यान्डल"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"किबोर्डसम्बन्धी सेटिङ"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"सर्टकट सेट गर्नुहोस्"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"हटाउनुहोस्"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"रद्द गर्नुहोस्"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"की थिच्नुहोस्"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"यो की कम्बिनेसन प्रयोग गरिसकिएको छ। अर्कै की प्रयोग गरी हेर्नुहोस्।"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index c5c08b113ac1..12f415609065 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Als je een app wilt openen met een widget, moet je verifiëren dat jij het bent. Houd er ook rekening mee dat iedereen ze kan bekijken, ook als je tablet vergrendeld is. Bepaalde widgets zijn misschien niet bedoeld voor je vergrendelscherm en kunnen hier niet veilig worden toegevoegd."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Als je Widgets als sneltoets wilt toevoegen aan het vergrendelscherm, zorg je dat deze is aangezet in de instellingen."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Gebruiker wijzigen"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"pull-downmenu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Alle apps en gegevens in deze sessie worden verwijderd."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Naar de app links of bovenaan gaan als je een gesplitst scherm gebruikt"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Tijdens gesplitst scherm: een app vervangen door een andere"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Actief venster verplaatsen tussen schermen"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Venster naar links verplaatsen"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Venster naar rechts verplaatsen"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Venster maximaliseren"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Venster minimaliseren"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Invoer"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Overschakelen naar volgende taal"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Overschakelen naar vorige taal"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Systeemopties"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Systeem-apps"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Recente apps"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Gesplitst scherm"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Invoer"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"App-sneltoetsen"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Sneltoetsen"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Sneltoetsen aanpassen"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Sneltoets verwijderen?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Druk op de toets om de sneltoets toe te wijzen"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Hiermee wordt je aangepaste sneltoets definitief verwijderd."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Sneltoetsen zoeken"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Geen zoekresultaten"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Icoon voor samenvouwen"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Icoon voor actie- of metatoets"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plusicoon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Aanpassen"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Klaar"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Icoon voor uitvouwen"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"of"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"slash"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Handgreep voor slepen"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Toetsenbordinstellingen"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Sneltoets instellen"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Verwijderen"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Annuleren"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Druk op een toets"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Toetsencombinatie is al in gebruik. Probeer een andere toets."</string> diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml index b7d840ac9075..28d8cfc41d42 100644 --- a/packages/SystemUI/res/values-or/strings.xml +++ b/packages/SystemUI/res/values-or/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ଏକ ୱିଜେଟ ବ୍ୟବହାର କରି ଗୋଟିଏ ଆପ ଖୋଲିବା ପାଇଁ ଏହା ଆପଣ ଅଟନ୍ତି ବୋଲି ଆପଣଙ୍କୁ ଯାଞ୍ଚ କରିବାକୁ ହେବ। ଆହୁରି ମଧ୍ୟ, ଆପଣଙ୍କ ଟାବଲେଟ ଲକ ଥିଲେ ମଧ୍ୟ ଯେ କୌଣସି ବ୍ୟକ୍ତି ଏହାକୁ ଭ୍ୟୁ କରିପାରିବେ ବୋଲି ମନେ ରଖନ୍ତୁ। କିଛି ୱିଜେଟ ଆପଣଙ୍କ ଲକ ସ୍କ୍ରିନ ପାଇଁ ଉଦ୍ଦିଷ୍ଟ ହୋଇନଥାଇପାରେ ଏବଂ ଏଠାରେ ଯୋଗ କରିବା ଅସୁରକ୍ଷିତ ହୋଇପାରେ।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ବୁଝିଗଲି"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ୱିଜେଟ"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"ଏକ ସର୍ଟକଟ ଭାବେ ଲକ ସ୍କ୍ରିନରେ ୱିଜାଟ ଯୋଗ କରିବାକୁ, ସୁନିଶ୍ଚିତ କରନ୍ତୁ ଯେ ଏହା ସେଟିଂସରେ ସକ୍ଷମ ହୋଇଛି।"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ୟୁଜର୍ ବଦଳାନ୍ତୁ"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ପୁଲଡାଉନ ମେନୁ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ଏହି ସେସନର ସମସ୍ତ ଆପ୍ ଓ ଡାଟା ଡିଲିଟ୍ ହୋଇଯିବ।"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ବ୍ୟବହାର କରିବା ସମୟରେ ବାମପଟର ବା ଉପରର ଆପକୁ ସୁଇଚ କରନ୍ତୁ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ ସମୟରେ: କୌଣସି ଆପକୁ ଗୋଟିଏରୁ ଅନ୍ୟ ଏକ ଆପରେ ବଦଳାନ୍ତୁ"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"ସକ୍ରିୟ ୱିଣ୍ଡୋକୁ ଡିସପ୍ଲେଗୁଡ଼ିକ ମଧ୍ୟରେ ମୁଭ କରନ୍ତୁ"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"ୱିଣ୍ଡୋକୁ ବାମକୁ ମୁଭ କରନ୍ତୁ"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"ୱିଣ୍ଡୋକୁ ଡାହାଣକୁ ମୁଭ କରନ୍ତୁ"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"ୱିଣ୍ଡୋକୁ ବଡ଼ କରନ୍ତୁ"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"ୱିଣ୍ଡୋକୁ ଛୋଟ କରନ୍ତୁ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ଇନପୁଟ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ପରବର୍ତ୍ତୀ ଭାଷାକୁ ସୁଇଚ କରନ୍ତୁ"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"ପୂର୍ବବର୍ତ୍ତୀ ଭାଷାକୁ ସୁଇଚ କରନ୍ତୁ"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"ସିଷ୍ଟମ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"ସିଷ୍ଟମ ଆପ୍ସ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ମଲ୍ଟିଟାସ୍କିଂ"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"ବର୍ତ୍ତମାନର ଆପ୍ସ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"ସ୍ପ୍ଲିଟ ସ୍କ୍ରିନ"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ଇନପୁଟ"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ଆପ ସର୍ଟକଟ"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"କୀବୋର୍ଡ ସର୍ଟକଟ"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"କୀବୋର୍ଡ ସର୍ଟକଟଗୁଡ଼ିକୁ କଷ୍ଟମାଇଜ କରନ୍ତୁ"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"ସର୍ଟକଟକୁ କାଢ଼ି ଦେବେ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"ସର୍ଟକଟ ଆସାଇନ କରିବା ପାଇଁ କୀ\'କୁ ଦବାନ୍ତୁ"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ଏହା ଆପଣଙ୍କ କଷ୍ଟମ ସର୍ଟକଟକୁ ସ୍ଥାୟୀ ଭାବେ ଡିଲିଟ କରିଦେବ।"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ସର୍ଚ୍ଚ ସର୍ଟକଟ"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"କୌଣସି ସର୍ଚ୍ଚ ଫଳାଫଳ ନାହିଁ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ଆଇକନକୁ ସଙ୍କୁଚିତ କରନ୍ତୁ"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ଆକ୍ସନ କିମ୍ବା ମେଟା କୀ ଆଇକନ"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"ପ୍ଲସ ଆଇକନ"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"କଷ୍ଟମାଇଜ କରନ୍ତୁ"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ହୋଇଗଲା"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ଆଇକନକୁ ବିସ୍ତାର କରନ୍ତୁ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"କିମ୍ବା"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"ପ୍ଲସ"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ଫରୱାର୍ଡ ସ୍ଲାସ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ଡ୍ରାଗ ହେଣ୍ଡେଲ"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"କୀବୋର୍ଡ ସେଟିଂ"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ସର୍ଟକଟ ସେଟ କରନ୍ତୁ"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"କାଢ଼ି ଦିଅନ୍ତୁ"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"ବାତିଲ କରନ୍ତୁ"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"କୀ ଦବାନ୍ତୁ"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"କୀ କମ୍ବିନେସନ ପୂର୍ବରୁ ବ୍ୟବହାର କରାଯାଉଛି। ଅନ୍ୟ ଏକ କୀ ବ୍ୟବହାର କରି ଦେଖନ୍ତୁ।"</string> diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml index 1dd40793b53e..9df55d6d431a 100644 --- a/packages/SystemUI/res/values-pa/strings.xml +++ b/packages/SystemUI/res/values-pa/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ਵਿਜੇਟ ਦੀ ਵਰਤੋਂ ਕਰ ਕੇ ਐਪ ਖੋਲ੍ਹਣ ਲਈ, ਤੁਹਾਨੂੰ ਇਹ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਪਵੇਗੀ ਕਿ ਇਹ ਤੁਸੀਂ ਹੀ ਹੋ। ਨਾਲ ਹੀ, ਇਹ ਵੀ ਧਿਆਨ ਵਿੱਚ ਰੱਖੋ ਕਿ ਕੋਈ ਵੀ ਉਨ੍ਹਾਂ ਨੂੰ ਦੇਖ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਲਾਕ ਹੋਵੇ। ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਕੁਝ ਵਿਜੇਟ ਤੁਹਾਡੀ ਲਾਕ ਸਕ੍ਰੀਨ ਲਈ ਨਾ ਬਣੇ ਹੋਣ ਅਤੇ ਉਨ੍ਹਾਂ ਨੂੰ ਇੱਥੇ ਸ਼ਾਮਲ ਕਰਨਾ ਅਸੁਰੱਖਿਅਤ ਹੋਵੇ।"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ਸਮਝ ਲਿਆ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ਵਿਜੇਟ"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ ਵਿਜੇਟ ਨੂੰ ਸ਼ਾਰਟਕੱਟ ਵਜੋਂ ਸ਼ਾਮਲ ਕਰਨ ਲਈ, ਪੱਕਾ ਕਰੋ ਕਿ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਇਹ ਸੁਵਿਧਾ ਚਾਲੂ ਹੈ।"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"ਵਰਤੋਂਕਾਰ ਸਵਿੱਚ ਕਰੋ"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"ਪੁੱਲਡਾਊਨ ਮੀਨੂ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ਇਸ ਸੈਸ਼ਨ ਵਿਚਲੀਆਂ ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡਾਟੇ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਵੇਲੇ ਖੱਬੇ ਜਾਂ ਉੱਪਰ ਮੌਜੂਦ ਐਪ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ ਦੌਰਾਨ: ਇੱਕ ਐਪ ਨਾਲ ਦੂਜੀ ਐਪ ਨੂੰ ਬਦਲੋ"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"ਕਿਰਿਆਸ਼ੀਲ ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਤੋਂ ਦੂਜੇ ਡਿਸਪਲੇ \'ਤੇ ਲਿਜਾਓ"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"ਵਿੰਡੋ ਨੂੰ ਖੱਬੇ ਪਾਸੇ ਲਿਜਾਓ"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"ਵਿੰਡੋ ਨੂੰ ਸੱਜੇ ਪਾਸੇ ਲਿਜਾਓ"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"ਵਿੰਡੋ ਨੂੰ ਵੱਡਾ ਕਰੋ"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"ਵਿੰਡੋ ਨੂੰ ਛੋਟਾ ਕਰੋ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ਇਨਪੁੱਟ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"ਅਗਲੀ ਭਾਸ਼ਾ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"ਪਿਛਲੀ ਭਾਸ਼ਾ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"ਸਿਸਟਮ ਸੰਬੰਧੀ ਕੰਟਰੋਲ"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"ਸਿਸਟਮ ਐਪਾਂ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ਮਲਟੀਟਾਸਕਿੰਗ"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"ਹਾਲੀਆ ਐਪਾਂ"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"ਸਪਲਿਟ ਸਕ੍ਰੀਨ"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ਇਨਪੁੱਟ"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ਐਪ ਸ਼ਾਰਟਕੱਟ"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਵਿਉਂਤਬੱਧ ਕਰੋ"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"ਕੀ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"ਸ਼ਾਰਟਕੱਟ ਨਿਰਧਾਰਿਤ ਕਰਨ ਲਈ ਕੁੰਜੀ ਦਬਾਓ"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ਇਸ ਨਾਲ ਤੁਹਾਡੇ ਵਿਉਂਤੇ ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਪੱਕੇ ਤੌਰ \'ਤੇ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ਸ਼ਾਰਟਕੱਟ ਖੋਜੋ"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ਕੋਈ ਖੋਜ ਨਤੀਜਾ ਨਹੀਂ ਮਿਲਿਆ"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ਪ੍ਰਤੀਕ ਨੂੰ ਸਮੇਟੋ"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ਕਾਰਵਾਈ ਜਾਂ Meta ਕੁੰਜੀ ਪ੍ਰਤੀਕ"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"ਜੋੜ-ਚਿੰਨ੍ਹ ਦਾ ਪ੍ਰਤੀਕ"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ਵਿਉਂਤਬੱਧ ਕਰੋ"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ਹੋ ਗਿਆ"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ਪ੍ਰਤੀਕ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ਜਾਂ"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"ਪਲੱਸ"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ਫਾਰਵਰਡ ਸਲੈਸ਼"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ਘਸੀਟਣ ਵਾਲਾ ਹੈਂਡਲ"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"ਕੀ-ਬੋਰਡ ਸੈਟਿੰਗਾਂ"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ਸ਼ਾਰਟਕੱਟ ਸੈੱਟ ਕਰੋ"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"ਹਟਾਓ"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"ਰੱਦ ਕਰੋ"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"ਕੁੰਜੀ ਦਬਾਓ"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"ਕੁੰਜੀ ਸੁਮੇਲ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਵਿੱਚ ਹੈ। ਕੋਈ ਹੋਰ ਕੁੰਜੀ ਵਰਤ ਕੇ ਦੇਖੋ।"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 82fe86153be2..9edb183e08d4 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Aby otworzyć aplikację za pomocą widżetu, musisz potwierdzić swoją tożsamość. Pamiętaj też, że każdy będzie mógł wyświetlić widżety nawet wtedy, gdy tablet będzie zablokowany. Niektóre widżety mogą nie być przeznaczone do umieszczenia na ekranie blokady i ich dodanie w tym miejscu może być niebezpieczne."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widżety"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Aby dodać Widżety na ekranie blokady jako skrót, upewnij się, że ta opcja jest włączona w ustawieniach."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Przełącz użytkownika"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Wszystkie aplikacje i dane w tej sesji zostaną usunięte."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Przełącz się na aplikację po lewej lub powyżej na podzielonym ekranie"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Podczas podzielonego ekranu: zastępowanie aplikacji"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Przenieś aktywne okno na inny ekran"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Przenieś okno w lewo"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Przenieś okno w prawo"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maksymalizuj okno"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimalizuj okno"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Wprowadzanie"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Przełącz na następny język"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Przełącz na poprzedni język"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Systemowe elementy sterujące"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Aplikacje systemowe"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Wielozadaniowość"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Ostatnie aplikacje"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Podzielony ekran"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Wprowadzanie"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Skróty do aplikacji"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Skróty klawiszowe"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Dostosuj skróty klawiszowe"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Usunąć skrót?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Naciśnij klawisz, aby przypisać skrót"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Spowoduje to trwałe usunięcie skrótu niestandardowego."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Skróty do wyszukiwania"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Brak wyników wyszukiwania"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona zwijania"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikona klawisza działania/meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikona plusa"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Dostosuj"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gotowe"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozwijania"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"lub"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ukośnik prawy"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Uchwyt do przeciągania"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Ustawienia klawiatury"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Ustaw skrót"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Usuń"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Anuluj"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Naciśnij klawisz"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Kombinacja klawiszy jest już używana. Użyj innego klawisza."</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index e65dccb022d6..3871f7ab3c83 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir um app usando um widget, você precisa confirmar sua identidade. E não se esqueça que qualquer pessoa pode ver os widgets, mesmo com o tablet bloqueado. Além disso, alguns apps não foram criados para a tela de bloqueio, é melhor manter a segurança."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendi"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Para adicionar o recurso \"Widgets na tela de bloqueio\" como um atalho, verifique se os atalhos estão ativados nas configurações."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Trocar usuário"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu suspenso"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Todos os apps e dados nesta sessão serão excluídos."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mudar para o app à esquerda ou acima ao usar a tela dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Com a tela dividida: substituir um app por outro"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Mover janela ativa entre telas"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Mover janela para a esquerda"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Mover janela para a direita"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximizar janela"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizar janela"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Mudar para o próximo idioma"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Mudar para o idioma anterior"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Controles do sistema"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Apps do sistema"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitarefas"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Apps recentes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Tela dividida"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Atalhos de apps"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Atalhos do teclado"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizar atalhos de teclado"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Remover atalho?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Pressione a tecla para atribuir o atalho"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Essa ação vai excluir permanentemente seu atalho personalizado."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pesquisar atalhos"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nenhum resultado de pesquisa"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone \"Fechar\""</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ícone da tecla de ação"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ícone de adição"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Concluir"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone \"Abrir\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"mais"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barra para a direita"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Alça de arrastar"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Configurações do teclado"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Definir atalho"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Remover"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancelar"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Pressione a tecla"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Essa combinação de teclas já está em uso. Tente outra tecla."</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 3dcba3010e67..c0e65c74dea9 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir uma app através de um widget, vai ter de validar a sua identidade. Além disso, tenha em atenção que qualquer pessoa pode ver os widgets, mesmo quando o tablet estiver bloqueado. Alguns widgets podem não se destinar ao ecrã de bloqueio e pode ser inseguro adicioná-los aqui."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Para adicionar widgets ao ecrã de bloqueio como um atalho, certifique-se de que estão ativados nas definições."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Mudar utilizador"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu pendente"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Todas as apps e dados desta sessão serão eliminados."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Controlos do sistema"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Apps do sistema"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Execução de várias tarefas em simultâneo"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Apps recentes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Ecrã dividido"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Atalhos de apps"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Atalhos de teclado"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalize os atalhos de teclado"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Remover atalho?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Prima a tecla para atribuir o atalho"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Esta ação elimina o atalho personalizado permanentemente."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pesquisar atalhos"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nenhum resultado da pesquisa"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone de reduzir"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ícone da tecla Meta ou de ação"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ícone de mais"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Concluir"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone de expandir"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Definições do teclado"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Configurar atalho"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Remover"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancelar"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Prima a tecla"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"A combinação de teclas já está a ser usada. Experimente outra tecla."</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index e65dccb022d6..3871f7ab3c83 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para abrir um app usando um widget, você precisa confirmar sua identidade. E não se esqueça que qualquer pessoa pode ver os widgets, mesmo com o tablet bloqueado. Além disso, alguns apps não foram criados para a tela de bloqueio, é melhor manter a segurança."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Entendi"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgets"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Para adicionar o recurso \"Widgets na tela de bloqueio\" como um atalho, verifique se os atalhos estão ativados nas configurações."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Trocar usuário"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menu suspenso"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Todos os apps e dados nesta sessão serão excluídos."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Mudar para o app à esquerda ou acima ao usar a tela dividida"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Com a tela dividida: substituir um app por outro"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Mover janela ativa entre telas"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Mover janela para a esquerda"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Mover janela para a direita"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximizar janela"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizar janela"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Entrada"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Mudar para o próximo idioma"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Mudar para o idioma anterior"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Controles do sistema"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Apps do sistema"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitarefas"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Apps recentes"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Tela dividida"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Entrada"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Atalhos de apps"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Atalhos do teclado"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizar atalhos de teclado"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Remover atalho?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Pressione a tecla para atribuir o atalho"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Essa ação vai excluir permanentemente seu atalho personalizado."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Pesquisar atalhos"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Nenhum resultado de pesquisa"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ícone \"Fechar\""</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ícone da tecla de ação"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ícone de adição"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizar"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Concluir"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ícone \"Abrir\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ou"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"mais"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"barra para a direita"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Alça de arrastar"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Configurações do teclado"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Definir atalho"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Remover"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Cancelar"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Pressione a tecla"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Essa combinação de teclas já está em uso. Tente outra tecla."</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 93333c0db9ae..5911c405fcdd 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Pentru a deschide o aplicație folosind un widget, va trebui să-ți confirmi identitatea. În plus, reține că oricine poate să vadă widgeturile, chiar dacă tableta este blocată. Este posibil ca unele widgeturi să nu fi fost create pentru ecranul de blocare și poate fi nesigur să le adaugi aici."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgeturi"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Pentru a adăuga widgeturi pe ecranul de blocare drept comandă rapidă, verifică dacă sunt activate în setări."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Schimbă utilizatorul"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"meniu vertical"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Toate aplicațiile și datele din această sesiune vor fi șterse."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Treci la aplicația din stânga sau de mai sus cu ecranul împărțit"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"În modul ecran împărțit: înlocuiește o aplicație cu alta"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Mută fereastra activă de pe un ecran pe altul"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Mută fereastra spre stânga"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Mută fereastra spre dreapta"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximizează fereastra"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizează fereastra"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Introducere"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Comută la următoarea limbă"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Comută la limba anterioară"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Comenzile sistemului"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Aplicații de sistem"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Aplicații recente"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Ecran împărțit"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Intrare"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Comenzi rapide pentru aplicații"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Comenzi rapide de la tastatură"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizează comenzile rapide de la tastatură"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Elimini comanda rapidă?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Apasă tasta pentru a atribui comanda rapidă"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Astfel, se va șterge definitiv comanda rapidă personalizată."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Comenzi directe de căutare"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Niciun rezultat al căutării"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Pictograma de restrângere"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Pictograma pentru acțiune sau tastă Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Pictograma plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizează"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Gata"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Pictograma de extindere"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"sau"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"bară oblică spre dreapta"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Ghidaj de tragere"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Setările tastaturii"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Setează o comandă rapidă"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Elimină"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Anulează"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Apasă tasta"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Combinația de taste este deja folosită. Încearcă altă tastă."</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 4641e016af66..95c4ee3ffe1f 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Чтобы открыть приложение, используя виджет, вам нужно будет подтвердить свою личность. Обратите внимание, что виджеты видны всем, даже если планшет заблокирован. Некоторые виджеты не предназначены для использования на заблокированном экране. Добавлять их туда может быть небезопасно."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"ОК"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Виджеты"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Чтобы добавить виджеты на заблокированный экран, включите в настройках параметр \"Виджеты на заблокированном экране\"."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Сменить пользователя."</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"раскрывающееся меню"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Все приложения и данные этого профиля будут удалены."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Перейти к приложению слева или вверху на разделенном экране"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"В режиме разделения экрана заменить одно приложение другим"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Переместить активное окно между экранами"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Переместить окно влево"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Переместить окно вправо"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Развернуть окно"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Свернуть окно"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Ввод"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Выбрать следующий язык"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Выбрать предыдущий язык"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Управление системой"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Системные приложения"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Многозадачность"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Недавние приложения"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Разделение экрана"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Ввод"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Быстрые клавиши для приложений"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Быстрые клавиши"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Как настроить быстрые клавиши"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Удалить сочетание клавиш?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Нажмите клавишу, чтобы назначить сочетание клавиш."</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Настроенное сочетание будет безвозвратно удалено."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Найти быстрые клавиши"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ничего не найдено"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок \"Свернуть\""</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Значок клавиши Meta для выполнения действия"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Значок плюса"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Настроить"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок \"Развернуть\""</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"или"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"плюс"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"косая черта"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Маркер перемещения"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Настройки клавиатуры"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Задать сочетание клавиш"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Удалить"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Отмена"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Нажмите клавишу"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Это сочетание клавиш уже используется. Попробуйте другое."</string> diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml index 7f85b6f7387f..36879d6b7cb0 100644 --- a/packages/SystemUI/res/values-si/strings.xml +++ b/packages/SystemUI/res/values-si/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"විජට් එකක් භාවිතයෙන් යෙදුමක් විවෘත කිරීමට, ඔබට ඒ ඔබ බව සත්යාපනය කිරීමට අවශ්ය වනු ඇත. එසේම, ඔබේ ටැබ්ලටය අගුළු දමා ඇති විට පවා ඕනෑම කෙනෙකුට ඒවා බැලිය හැකි බව මතක තබා ගන්න. සමහර විජට් ඔබේ අගුළු තිරය සඳහා අදහස් කර නොතිබිය හැකි අතර මෙහි එක් කිරීමට අනාරක්ෂිත විය හැක."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"තේරුණා"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"විජට්"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"කෙටිමඟක් ලෙස අගුළු තිරය මත Widgets එක් කිරීමට, එය සැකසීම් තුළ සබල කර ඇති බවට වග බලා ගන්න."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"පරිශීලක මාරුව"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"නිපතන මෙනුව"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"මෙම සැසියේ සියළුම යෙදුම් සහ දත්ත මකාවී."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"බෙදුම් තිරය භාවිත කරන අතරතුර වමේ හෝ ඉහළ ඇති යෙදුමට මාරු වන්න"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"බෙදුම් තිරය අතරතුර: යෙදුමක් එකකින් තවත් එකක් ප්රතිස්ථාපනය කරන්න"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"සක්රිය කවුළුව සංදර්ශක අතර ගෙන යන්න"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"කවුළුව වමට ගෙන යන්න"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"කවුළුව දකුණට ගෙන යන්න"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"කවුළුව විහිදන්න"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"කවුළුව කුඩා කරන්න"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ආදානය"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"මීළඟ භාෂාවට මාරු වන්න"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"පෙර භාෂාවට මාරු වන්න"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"පද්ධති පාලන"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"පද්ධති යෙදුම්"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"බහුකාර්ය"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"මෑත යෙදුම්"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"බෙදුම් තිරය"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ආදානය"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"යෙදුම් කෙටිමං"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"යතුරු පුවරු කෙටි මං"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"යතුරුපුවරු කෙටිමං අභිරුචිකරණය කරන්න"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"කෙටිමඟ ඉවත් කරන්න ද?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"කෙටිමඟ පැවරීමට යතුර ඔබන්න"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"මෙය ඔබේ අභිරුචි කෙටිමඟ ස්ථිරවම මකනු ඇත."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"කෙටි මං සොයන්න"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"සෙවීම් ප්රතිඵල නැත"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"හැකුළුම් නිරූපකය"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ක්රියාව හෝ Meta යතුරු නිරූපකය"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"ධන නිරූපකය"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"අභිරුචිකරණය කරන්න"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"නිමයි"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"දිගහැරීම් නිරූපකය"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"හෝ"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"ධන"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ඉදිරියට ඉර"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"ඇදීම් හැඬලය"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"යතුරු පුවරු සැකසීම්"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"කෙටිමඟ සකසන්න"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"ඉවත් කරන්න"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"අවලංගු කරන්න"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"යතුර ඔබන්න"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"යතුරු සංයෝජනය දැනටමත් භාවිත වේ. වෙනත් යතුරක් උත්සාහ කරන්න."</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 6dc7a66f7f8f..c972c180a484 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Ak chcete otvoriť aplikáciu pomocou miniaplikácie, budete musieť overiť svoju totožnosť. Pamätajte, že si miniaplikáciu môže pozrieť ktokoľvek, aj keď máte tablet uzamknutý. Niektoré miniaplikácie možno nie sú určené pre uzamknutú obrazovku a ich pridanie tu môže byť nebezpečné."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Dobre"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Miniaplikácie"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Ak chcete na uzamknutú obrazovku pridať miniaplikácie ako odkaz, uistite sa, že sú v nastaveniach povolené."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Prepnutie používateľa"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"rozbaľovacia ponuka"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Všetky aplikácie a údaje v tejto relácii budú odstránené."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Prechod na aplikáciu vľavo alebo hore pri rozdelenej obrazovke"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Počas rozdelenej obrazovky: nahradenie aplikácie inou"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Presun aktívneho okna medzi obrazovkami"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Presun okna doľava"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Presun okna doprava"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximalizovanie okna"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimalizovanie okna"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Vstup"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Prepnutie na ďalší jazyk"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Prepnutie na predchádzajúci jazyk"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Ovládanie systému"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Systémové aplikácie"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multitasking"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nedávne aplikácie"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Rozdelená obrazovka"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Vstup"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Skratky aplikácií"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klávesové skratky"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prispôsobenie klávesových skratiek"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Chcete skratku odstrániť?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Stlačením klávesa priraďte skratku"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Týmto natrvalo odstránite vlastnú skratku."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Prehľadávať skratky"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Žiadne výsledky vyhľadávania"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona zbalenia"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikona akčného klávesa alebo metaklávesa"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikona plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prispôsobiť"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Hotovo"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona rozbalenia"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"alebo"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"lomka"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Presúvadlo"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Nastavenia klávesnice"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Nastaviť skratku"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Odstrániť"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Zrušiť"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Stlačte kláves"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Kombinácia klávesov sa už používa. Skúste iný kláves."</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 74fbd06e15b2..914df7219f25 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Če želite aplikacijo odpreti s pripomočkom, morate potrditi, da ste to vi. Upoštevajte tudi, da si jih lahko ogledajo vsi, tudi ko je tablični računalnik zaklenjen. Nekateri pripomočki morda niso predvideni za uporabo na zaklenjenem zaslonu, zato jih tukaj morda ni varno dodati."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Razumem"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Pripomočki"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Če želite na zaklenjen zaslon dodati pripomočke kot bližnjico, morate to omogočiti v nastavitvah."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Preklop med uporabniki"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"spustni meni"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Vse aplikacije in podatki v tej seji bodo izbrisani."</string> @@ -1415,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Sistemski kontrolniki"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Sistemske aplikacije"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Večopravilnost"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Nedavne aplikacije"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Razdeljen zaslon"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Vnos"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Bližnjice do aplikacij"</string> @@ -1424,14 +1426,20 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Bližnjične tipke"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Prilagajanje bližnjičnih tipk"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Želite odstraniti bližnjico?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Pritisnite tipko za dodelitev bližnjice"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"S tem boste trajno izbrisali bližnjico po meri."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Iskanje po bližnjicah"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ni rezultatov iskanja"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona za strnitev"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikona tipke za dejanje ali metapodatke"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikona znaka plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Prilagodi"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Končano"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona za razširitev"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ali"</string> @@ -1441,6 +1449,8 @@ <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Nastavitve tipkovnice"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Nastavite bližnjico"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Odstrani"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Prekliči"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Pritisnite tipko"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Kombinacija tipk je že v uporabi. Poskusite z drugo tipko."</string> diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml index bd68061a13db..6a597f7bd8f8 100644 --- a/packages/SystemUI/res/values-sq/strings.xml +++ b/packages/SystemUI/res/values-sq/strings.xml @@ -306,8 +306,7 @@ <string name="turn_on_bluetooth" msgid="5681370462180289071">"Përdor Bluetooth-in"</string> <string name="quick_settings_bluetooth_device_connected" msgid="7884777006729260996">"Lidhur"</string> <string name="quick_settings_bluetooth_device_audio_sharing" msgid="1496358082943301670">"Ndarja e audios"</string> - <!-- no translation found for quick_settings_bluetooth_device_audio_sharing_or_switch_active (8680997711431098238) --> - <skip /> + <string name="quick_settings_bluetooth_device_audio_sharing_or_switch_active" msgid="8680997711431098238">"Mbështet ndarjen e audios"</string> <string name="quick_settings_bluetooth_device_saved" msgid="7549938728928069477">"Ruajtur"</string> <string name="accessibility_quick_settings_bluetooth_device_tap_to_disconnect" msgid="415980329093277342">"shkëput"</string> <string name="accessibility_quick_settings_bluetooth_device_tap_to_activate" msgid="3724301751036877403">"aktivizo"</string> @@ -530,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Për të hapur një aplikacion duke përdorur një miniaplikacion, do të duhet të verifikosh që je ti. Ki parasysh gjithashtu që çdo person mund t\'i shikojë, edhe kur tableti yt është i kyçur. Disa miniaplikacione mund të mos jenë planifikuar për ekranin tënd të kyçjes dhe mund të mos jetë e sigurt t\'i shtosh këtu."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"E kuptova"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Miniaplikacionet"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Për të shtuar \"Miniaplikacionet në ekranin e kyçjes\" si shkurtore, sigurohu që kjo veçori të jetë aktivizuar te cilësimet."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Ndërro përdorues"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menyja me tërheqje poshtë"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Të gjitha aplikacionet dhe të dhënat në këtë sesion do të fshihen."</string> @@ -876,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Kalo tek aplikacioni në të majtë ose sipër kur përdor ekranin e ndarë"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Gjatë ekranit të ndarë: zëvendëso një aplikacion me një tjetër"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Zhvendose dritaren aktive mes ekraneve"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Zhvendos dritaren në të majtë"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Zhvendos dritaren në të djathtë"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maksimizo dritaren"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimizo dritaren"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Hyrja"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Kalo te gjuha tjetër"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Kalo te gjuha e mëparshme"</string> @@ -1420,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Kontrollet e sistemit"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Aplikacionet e sistemit"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Kryerja e shumë detyrave"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Aplikacionet e fundit"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Ekrani i ndarë"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Hyrja"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Shkurtoret e aplikacionit"</string> @@ -1429,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Shkurtoret e tastierës"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Personalizo shkurtoret e tastierës"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Të hiqet shkurtorja?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Shtyp tastin për të caktuar shkurtoren"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Kjo do ta fshijë përgjithmonë shkurtoren tënde të personalizuar."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Kërko për shkurtoret"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Asnjë rezultat kërkimi"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikona e palosjes"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikona e tastit të veprimit ose tastit Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Ikona e plusit"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Personalizo"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"U krye"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikona e zgjerimit"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"ose"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"vizë e pjerrët djathtas"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Doreza e zvarritjes"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Cilësimet e tastierës"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Cakto shkurtoren"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Hiq"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Anulo"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Shtyp tastin"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Kombinimi i tasteve është tashmë në përdorim. Provo një tast tjetër."</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index cc18b668a281..560f4d700d22 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Да бисте отворили апликацију која користи виџет, треба да потврдите да сте то ви. Имајте у виду да свако може да га види, чак и када је таблет закључан. Неки виџети можда нису намењени за закључани екран и можда није безбедно да их тамо додате."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Важи"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Виџети"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Да бисте додали виџете на закључани екран као пречицу, уверите се да је то омогућено у подешавањима."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Замени корисника"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"падајући мени"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Све апликације и подаци у овој сесији ће бити избрисани."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Пређите у апликацију слева или изнад док користите подељени екран"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"У режиму подељеног екрана: замена једне апликације другом"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Премести активан прозор на следећи екран"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Померите прозор налево"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Померите прозор надесно"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Повећајте прозор"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Смањите прозор"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Унос"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Пређи на следећи језик"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Пређи на претходни језик"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Системске контроле"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Системске апликације"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Обављање више задатака истовремено"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Недавне апликације"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Подељени екран"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Унос"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Пречице за апликације"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Тастерске пречице"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Прилагодите тастерске пречице"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Желите да уклоните пречицу?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Притисните тастер да бисте доделили пречицу"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Овим ћете трајно избрисати прилагођену пречицу."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Претражите пречице"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Нема резултата претраге"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Икона за скупљање"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Икона тастера за радњу или мета тастера"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Икона знака плус"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Прилагоди"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Икона за проширивање"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"или"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"плус"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"коса црта унапред"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Маркер за превлачење"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Подешавања тастатуре"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Подеси пречицу"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Уклони"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Откажи"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Притисните тастер"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Комбинација тастера се већ користи. Пробајте са другим тастером."</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index fae3c11f1344..2996033d36ad 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Du måste verifiera din identitet innan du öppnar en app med en widget. Tänk också på att alla kan se dem, även när surfplattan är låst. Vissa widgetar kanske inte är avsedda för låsskärmen och det kan vara osäkert att lägga till dem här."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widgetar"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Om du vill lägga till widgetar på låsskärmen som en genväg måste du se till att de är aktiverade i inställningarna."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Byt användare"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"rullgardinsmeny"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Alla appar och data i denna session kommer att raderas."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Byt till appen till vänster eller ovanför när du använder delad skärm"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Med delad skärm: ersätt en app med en annan"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Flytta det aktiva fönstret mellan skärmar"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Flytta fönstret åt vänster"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Flytta fönstret åt höger"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Maximera fönstret"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Minimera fönstret"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Inmatning"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Byt till nästa språk"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Byt till föregående språk"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Systeminställningar"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Systemappar"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multikörning"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Senaste apparna"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Delad skärm"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Inmatning"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Genvägar till appar"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Kortkommandon"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Anpassa kortkommandon"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Vill du ta bort kortkommandot?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Tryck på tangenten för att tilldela ett kortkommando"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Det anpassade kortkommandot raderas permanent."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Sökgenvägar"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Inga sökresultat"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Ikonen Komprimera"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Ikon för åtgärdstangent"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plusikon"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Anpassa"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Klar"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Ikonen Utöka"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"eller"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"snedstreck"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Handtag"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Tangentbordsinställningar"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Ange kortkommando"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Ta bort"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Avbryt"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Tryck på tangenten"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Tangentkombinationen används redan. Testa en annan tangent."</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index d8581e8aa519..7084bbf4d6a6 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Utahitaji kuthibitisha kuwa ni wewe ili ufungue programu ukitumia wijeti. Pia, kumbuka kuwa mtu yeyote anaweza kuziona, hata kishikwambi chako kikiwa kimefungwa. Huenda baadhi ya wijeti hazikukusudiwa kutumika kwenye skrini yako iliyofungwa na huenda si salama kuziweka hapa."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Nimeelewa"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Wijeti"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Ili kuweka kipengele cha Wijeti kwenye skrini iliyofungwa kiwe njia ya mkato, hakikisha kimewashwa katika mipangilio."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Badili mtumiaji"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"menyu ya kuvuta chini"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Data na programu zote katika kipindi hiki zitafutwa."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Badilisha uende kwenye programu iliyo kushoto au juu unapotumia hali ya kugawa skrini"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ukigawanya skrini: badilisha kutoka programu moja hadi nyingine"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Hamisha dirisha linalotumika kati ya skrini moja na nyingine"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Sogeza dirisha kushoto"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Sogeza dirisha kulia"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Panua dirisha"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Punguza dirisha"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Vifaa vya kuingiza data"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Badilisha utumie lugha inayofuata"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Badilisha utumie lugha iliyotangulia"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Vidhibiti vya mfumo"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Programu za mfumo"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Majukumu mengi"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Programu za hivi majuzi"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Gawa skrini"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Kifaa cha kuingiza data"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Njia za mikato za programu"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Mikato ya kibodi"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Weka mapendeleo ya mikato ya kibodi"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Ungependa kuondoa njia ya mkato?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Bonyeza kitufe ukabidhi njia ya mkato"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Hatua hii itaondoa kabisa njia yako maalum ya mkato."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Njia mkato za kutafutia"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Hamna matokeo ya utafutaji"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Kunja aikoni"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Aikoni ya kitufe cha Vitendo au cha Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Aikoni ya alama ya kujumlisha"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Weka mapendeleo"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Nimemaliza"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Panua aikoni"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"au"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"na"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"mkwaju wa mbele"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Aikoni ya buruta"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Mipangilio ya Kibodi"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Weka njia ya mkato"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Ondoa"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Acha"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Bonyeza kitufe"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Tayari unatumia mchanganyiko wa vitufe. Jaribu kitufe kingine."</string> diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml index f2145ff5d1aa..959e2e6d07ca 100644 --- a/packages/SystemUI/res/values-ta/strings.xml +++ b/packages/SystemUI/res/values-ta/strings.xml @@ -117,7 +117,7 @@ <string name="screenrecord_permission_dialog_warning_single_app" msgid="3738199712880063924">"ஓர் ஆப்ஸை ரெக்கார்டு செய்யும்போது அதில் காட்டப்படும் அல்லது பிளே செய்யப்படும் அனைத்தும் ரெக்கார்டு செய்யப்படும். எனவே கடவுச்சொற்கள், பேமெண்ட் விவரங்கள், மெசேஜ்கள், படங்கள், ஆடியோ, வீடியோ போன்றவை குறித்துக் கவனத்துடன் இருங்கள்."</string> <string name="screenrecord_permission_dialog_continue_entire_screen" msgid="5557974446773486600">"திரையை ரெக்கார்டு செய்"</string> <string name="screenrecord_app_selector_title" msgid="3854492366333954736">"ரெக்கார்டு செய்ய ஆப்ஸைத் தேர்வுசெய்தல்"</string> - <string name="screenrecord_audio_label" msgid="6183558856175159629">"ஆடியோவை ரெக்கார்டு செய்"</string> + <string name="screenrecord_audio_label" msgid="6183558856175159629">"ஆடியோவை ரெக்கார்டு செய்தல்"</string> <string name="screenrecord_device_audio_label" msgid="9016927171280567791">"சாதன ஆடியோ"</string> <string name="screenrecord_device_audio_description" msgid="4922694220572186193">"இசை, அழைப்புகள், ரிங்டோன்கள் போன்ற உங்கள் சாதனத்திலிருந்து வரும் ஒலி"</string> <string name="screenrecord_mic_label" msgid="2111264835791332350">"மைக்ரோஃபோன்"</string> @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"விட்ஜெட்டைப் பயன்படுத்தி ஆப்ஸைத் திறக்க, அது நீங்கள்தான் என்பதை உறுதிசெய்ய வேண்டும். அத்துடன், உங்கள் டேப்லெட் பூட்டப்பட்டிருந்தாலும்கூட அவற்றை யார் வேண்டுமானாலும் பார்க்கலாம் என்பதை நினைவில்கொள்ளுங்கள். சில விட்ஜெட்கள் உங்கள் பூட்டுத் திரைக்காக உருவாக்கப்பட்டவை அல்ல என்பதையும் அவற்றை இங்கே சேர்ப்பது பாதுகாப்பற்றதாக இருக்கக்கூடும் என்பதையும் நினைவில்கொள்ளுங்கள்."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"சரி"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"விட்ஜெட்கள்"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"\'பூட்டுத் திரையில் விட்ஜெட்கள்\' அம்சத்தை ஷார்ட்கட்டாகச் சேர்க்க, அமைப்புகளில் அது இயக்கப்பட்டுள்ளதை உறுதிப்படுத்தவும்."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"பயனரை மாற்று"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"கீழ் இழுக்கும் மெனு"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"இந்த அமர்வின் எல்லா ஆப்ஸும் தரவும் நீக்கப்படும்."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"திரைப் பிரிப்பைப் பயன்படுத்தும்போது இடது/மேலே உள்ள ஆப்ஸுக்கு மாறுதல்"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"திரைப் பிரிப்பின்போது: ஓர் ஆப்ஸுக்குப் பதிலாக மற்றொன்றை மாற்றுதல்"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"காட்சிகளுக்கு இடையே செயலில் உள்ள சாளரத்தை நகர்த்துதல்"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"சாளரத்தை இடதுபுறமாக நகர்த்துதல்"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"சாளரத்தை வலதுபுறமாக நகர்த்துதல்"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"சாளரத்தைப் பெரிதாக்குதல்"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"சாளரத்தைச் சிறிதாக்குதல்"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"உள்ளீடு"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"அடுத்த மொழிக்கு மாற்றுதல்"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"முந்தைய மொழிக்கு மாற்றுதல்"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"சிஸ்டம் கட்டுப்பாடுகள்"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"சிஸ்டம் ஆப்ஸ்"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"பல வேலைகளைச் செய்தல்"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"சமீபத்திய ஆப்ஸ்"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"திரைப் பிரிப்பு"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"உள்ளீடு"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ஆப்ஸ் ஷார்ட்கட்கள்"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"கீபோர்டு ஷார்ட்கட்கள்"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"கீபோர்டு ஷார்ட்கட்களைப் பிரத்தியேகப்படுத்துதல்"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"ஷார்ட்கட்டை அகற்றவா?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"ஷார்ட்கட்டை அமைக்க பட்டனை அழுத்துங்கள்"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"இது உங்கள் பிரத்தியேக ஷார்ட்கட்டை நிரந்தரமாக நீக்கும்."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ஷார்ட்கட்களைத் தேடுக"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"தேடல் முடிவுகள் இல்லை"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"சுருக்குவதற்கான ஐகான்"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ஆக்ஷன்/மெட்டா பட்டன் ஐகான்"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"பிளஸ் ஐகான்"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"பிரத்தியேகப்படுத்தும்"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"முடிந்தது"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"விரிவாக்குவதற்கான ஐகான்"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"அல்லது"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"மற்றும்"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ஃபார்வர்டு ஸ்லாஷ்"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"இழுப்பதற்கான ஹேண்டில்"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"கீபோர்டு அமைப்புகள்"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ஷார்ட்கட்டை அமையுங்கள்"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"அகற்று"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"ரத்துசெய்"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"பட்டனை அழுத்துங்கள்"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"பட்டன் சேர்க்கை ஏற்கெனவே பயன்பாட்டில் உள்ளது. வேறொரு பட்டனைப் பயன்படுத்திப் பார்க்கவும்."</string> diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml index 2c7279657ea1..a66821b05386 100644 --- a/packages/SystemUI/res/values-te/strings.xml +++ b/packages/SystemUI/res/values-te/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"విడ్జెట్ను ఉపయోగించి యాప్ను తెరవడానికి, ఇది మీరేనని వెరిఫై చేయాల్సి ఉంటుంది. అలాగే, మీ టాబ్లెట్ లాక్ చేసి ఉన్నప్పటికీ, ఎవరైనా వాటిని చూడగలరని గుర్తుంచుకోండి. కొన్ని విడ్జెట్లు మీ లాక్ స్క్రీన్కు తగినవి కాకపోవచ్చు, వాటిని ఇక్కడ జోడించడం సురక్షితం కాకపోవచ్చు."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"అర్థమైంది"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"విడ్జెట్లు"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"లాక్ స్క్రీన్లో విడ్జెట్లను షార్ట్కట్గా జోడించడానికి, ఇది సెట్టింగ్లలో ఎనేబుల్ చేసి ఉందని నిర్ధారించుకోండి."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"వినియోగదారుని మార్చు"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"పుల్డౌన్ మెనూ"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ఈ సెషన్లోని అన్ని యాప్లు మరియు డేటా తొలగించబడతాయి."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"స్ప్లిట్ స్క్రీన్ ఉపయోగిస్తున్నప్పుడు ఎడమ లేదా పైన యాప్నకు మారండి"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"స్ప్లిట్ స్క్రీన్ సమయంలో: ఒక దాన్నుండి మరో దానికి యాప్ రీప్లేస్ చేయండి"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"యాక్టివ్ విండోను డిస్ప్లేల మధ్య తరలించండి"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"విండోను ఎడమ వైపునకు తరలించండి"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"విండోను కుడి వైపునకు తరలించండి"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"విండోను విస్తరించండి"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"విండోను కుదించండి"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ఇన్పుట్"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"తర్వాత భాషకు స్విచ్ అవ్వండి"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"మునుపటి భాషకు స్విచ్ అవ్వండి"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"సిస్టమ్ కంట్రోల్స్"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"సిస్టమ్ యాప్లు"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"మల్టీ-టాస్కింగ్"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"ఇటీవలి యాప్లు"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"స్ప్లిట్ స్క్రీన్"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ఇన్పుట్"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"యాప్ షార్ట్కట్లు"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"కీబోర్డ్ షార్ట్కట్లు"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"కీబోర్డ్ షార్ట్కట్లను అనుకూలంగా మార్చండి"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"షార్ట్కట్ను తీసివేయాలా?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"షార్ట్కట్ను కేటాయించడానికి కీని నొక్కండి"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"ఇది మీ అనుకూల షార్ట్కట్ను శాశ్వతంగా తొలగిస్తుంది."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"షార్ట్కట్లను వెతకండి"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"సెర్చ్ ఫలితాలు ఏవీ లేవు"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"కుదించండి చిహ్నం"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"యాక్షన్ లేదా మెటా కీ చిహ్నం"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"ప్లస్ చిహ్నం"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"అనుకూలంగా మార్చండి"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"పూర్తయింది"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"విస్తరించండి చిహ్నం"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"లేదా"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"ప్లస్ గుర్తు"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"ఫార్వర్డ్ స్లాష్"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"లాగే హ్యాండిల్"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"కీబోర్డ్ సెట్టింగ్లు"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"షార్ట్కట్ను సెట్ చేయండి"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"తీసివేయండి"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"రద్దు చేయండి"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"కీని నొక్కండి"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"కీ కాంబినేషన్ ఇప్పటికే వినియోగంలో ఉంది. వేరొక కీని ట్రై చేయండి."</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 6ca696826be8..5ead29f4d155 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"หากต้องการเปิดแอปโดยใช้วิดเจ็ต คุณจะต้องยืนยันตัวตนของคุณ นอกจากนี้ โปรดทราบว่าผู้อื่นจะดูวิดเจ็ตเหล่านี้ได้แม้ว่าแท็บเล็ตจะล็อกอยู่ก็ตาม วิดเจ็ตบางอย่างอาจไม่ได้มีไว้สำหรับหน้าจอล็อกของคุณ และอาจไม่ปลอดภัยที่จะเพิ่มที่นี่"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"รับทราบ"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"วิดเจ็ต"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"หากต้องการเพิ่มวิดเจ็ตในหน้าจอล็อกเป็นทางลัด โปรดตรวจสอบว่าได้เปิดใช้วิดเจ็ตแล้วในการตั้งค่า"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"สลับผู้ใช้"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"เมนูแบบเลื่อนลง"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"ระบบจะลบแอปและข้อมูลทั้งหมดในเซสชันนี้"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"เปลี่ยนไปใช้แอปทางด้านซ้ายหรือด้านบนขณะใช้โหมดแยกหน้าจอ"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"ระหว่างใช้โหมดแยกหน้าจอ: เปลี่ยนแอปหนึ่งเป็นอีกแอปหนึ่ง"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"ย้ายหน้าต่างที่ใช้งานไปยังหน้าจอต่างๆ"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"ย้ายหน้าต่างไปทางซ้าย"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"ย้ายหน้าต่างไปทางขวา"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"ขยายหน้าต่างเต็มหน้าจอ"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"ย่อหน้าต่าง"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"อินพุต"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"เปลี่ยนเป็นภาษาถัดไป"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"เปลี่ยนเป็นภาษาก่อนหน้า"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"การควบคุมระบบ"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"แอประบบ"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"การทํางานหลายอย่างพร้อมกัน"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"แอปล่าสุด"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"แยกหน้าจอ"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"อินพุต"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"แป้นพิมพ์ลัดของแอป"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"แป้นพิมพ์ลัด"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"ปรับแต่งแป้นพิมพ์ลัด"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"นำแป้นพิมพ์ลัดออกใช่ไหม"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"กดแป้นเพื่อกำหนดแป้นพิมพ์ลัด"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"การดำเนินการนี้จะลบแป้นพิมพ์ลัดที่กำหนดเองอย่างถาวร"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"ค้นหาแป้นพิมพ์ลัด"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"ไม่พบผลการค้นหา"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"ไอคอนยุบ"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"ไอคอนการดำเนินการหรือแป้น Meta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"ไอคอนเครื่องหมายบวก"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"ปรับแต่ง"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"เสร็จสิ้น"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"ไอคอนขยาย"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"หรือ"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"บวก"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"เครื่องหมายทับ"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"แฮนเดิลการลาก"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"การตั้งค่าแป้นพิมพ์"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"ตั้งค่าแป้นพิมพ์ลัด"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"นำออก"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"ยกเลิก"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"กดแป้น"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"มีการใช้แป้นที่กดร่วมกันนี้แล้ว โปรดลองใช้แป้นอื่น"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 2e1d28684786..76375a363342 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Para magbukas ng app gamit ang isang widget, kakailanganin mong i-verify na ikaw iyan. Bukod pa rito, tandaang puwedeng tingnan ng kahit na sino ang mga ito, kahit na naka-lock ang iyong tablet. Posibleng hindi para sa iyong lock screen ang ilang widget at posibleng hindi ligtas ang mga ito na idagdag dito."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Mga Widget"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Para magdagdag ng Mga Widget sa lock screen bilang shortcut, tiyaking naka-enable ito sa mga setting."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Magpalit ng user"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"pulldown menu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Ide-delete ang lahat ng app at data sa session na ito."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Lumipat sa app sa kaliwa o itaas habang ginagamit ang split screen"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Habang nasa split screen: magpalit-palit ng app"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Ilipat ang aktibong window sa pagitan ng mga display"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Ilipat ang window sa kaliwa"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Ilipat ang window sa kanan"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"I-maximize ang window"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"I-minimize ang window"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Input"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Lumipat sa susunod na wika"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Lumipat sa dating wika"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Mga kontrol ng system"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Mga system app"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Pag-multitask"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Mga kamakailang app"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Split screen"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Input"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Mga shortcut ng app"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Mga keyboard shortcut"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"I-customize ang mga keyboard shortcut"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Alisin ang shortcut?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Pindutin ang key para magtalaga ng shortcut"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Permanente nitong ide-delete ang iyong custom na shortcut."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Mga shortcut ng paghahanap"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Walang resulta ng paghahanap"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"I-collapse ang icon"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Icon ng Action o Meta key"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Icon na plus"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"I-customize"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Tapos na"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"I-expand ang icon"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"o"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"forward slash"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Handle sa pag-drag"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Mga Setting ng Keyboard"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Magtakda ng shortcut"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Alisin"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Kanselahin"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Pindutin ang key"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Ginagamit na ang kumbinasyon ng key. Sumubok ng ibang key."</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 6628d23e6cab..e1484e3eef4d 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Widget kullanarak bir uygulamayı açmak için kimliğinizi doğrulamanız gerekir. Ayrıca, tabletiniz kilitliyken bile widget\'ların herkes tarafından görüntülenebileceğini unutmayın. Bazı widget\'lar kilit ekranınız için tasarlanmamış olabileceğinden buraya eklenmeleri güvenli olmayabilir."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Anladım"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Widget\'lar"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Kilit ekranında widget\'lar özelliğini kısayol olarak eklemek için ayarlarda bu özelliğin etkinleştirildiğinden emin olun."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Kullanıcı değiştirme"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"açılır menü"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Bu oturumdaki tüm uygulamalar ve veriler silinecek."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Bölünmüş ekran kullanırken soldaki veya üstteki uygulamaya geçiş yapın"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Bölünmüş ekran etkinken: Bir uygulamayı başkasıyla değiştir"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Etkin pencereyi ekranlar arasında taşıma"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Pencereyi sola taşı"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Pencereyi sağa taşı"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Pencereyi ekranı kaplayacak şekilde büyüt"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Pencereyi simge durumuna küçült"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Giriş"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Sonraki dile geç"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Önceki dile geç"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Sistem kontrolleri"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Sistem uygulamaları"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Çoklu görev"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Son uygulamalar"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Bölünmüş ekran"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Giriş"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Uygulama kısayolları"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Klavye kısayolları"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Klavye kısayollarını özelleştirin"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Kısayol kaldırılsın mı?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Kısayol atamak için tuşa basın"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Bu işlem, özel kısayolunuzu kalıcı olarak siler."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Arama kısayolları"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Arama sonucu yok"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Daralt simgesi"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"İşlem veya Meta tuşu simgesi"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Artı simgesi"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Özelleştir"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Bitti"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Genişlet simgesi"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"veya"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"artı"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"eğik çizgi"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Sürükleme tutamacı"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Klavye Ayarları"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Kısayol ayarla"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Kaldır"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"İptal"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Tuşa basın"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Tuş kombinasyonu zaten kullanılıyor. Başka bir tuş deneyin."</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 71845a3500fe..e4cc156cd454 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Щоб відкрити додаток за допомогою віджета, вам потрібно буде підтвердити особу. Пам’ятайте також, що бачити віджети можуть усі, навіть коли планшет заблоковано. Можливо, деякі віджети не призначені для заблокованого екрана, і додавати їх на нього може бути небезпечно."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Віджети"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Щоб додати ярлик для опції \"Показувати віджети на заблокованому екрані\", переконайтеся, що її ввімкнено в налаштуваннях."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Змінити користувача"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"спадне меню"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Усі додатки й дані з цього сеансу буде видалено."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Під час розділення екрана перемикатися на додаток ліворуч або вгорі"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Під час розділення екрана: замінити додаток іншим"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Перемістити активне вікно між дисплеями"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Перемістити вікно ліворуч"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Перемістити вікно праворуч"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Розгорнути вікно"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Згорнути вікно"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Метод введення"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Вибрати наступну мову"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Вибрати попередню мову"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Елементи керування системою"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Системні додатки"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Багатозадачність"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Нещодавні додатки"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Розділити екран"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Введення"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Комбінації клавіш для додатків"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Комбінації клавіш"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Налаштуйте комбінації клавіш"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Видалити комбінацію клавіш?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Натисніть клавішу, щоб призначити комбінацію клавіш"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Вашу власну комбінацію клавіш буде видалено назавжди."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Комбінації клавіш для пошуку"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Нічого не знайдено"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Значок згортання"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Значок клавіші дії або метаклавіші"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Значок \"плюс\""</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Налаштувати"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Готово"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Значок розгортання"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"або"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"плюс"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"скісна риска"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Маркер переміщення"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Налаштування клавіатури"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Налаштувати комбінацію клавіш"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Видалити"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Скасувати"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Натисніть клавішу"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Комбінація клавіш уже використовується. Спробуйте іншу клавішу."</string> diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml index 514244f40304..def880692411 100644 --- a/packages/SystemUI/res/values-ur/strings.xml +++ b/packages/SystemUI/res/values-ur/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"ویجیٹ کے ذریعے ایپ کھولنے کے لیے آپ کو تصدیق کرنی ہوگی کہ یہ آپ ہی ہیں۔ نیز، ذہن میں رکھیں کہ کوئی بھی انہیں دیکھ سکتا ہے، یہاں تک کہ جب آپ کا ٹیبلیٹ مقفل ہو۔ ہو سکتا ہے کچھ ویجٹس آپ کی لاک اسکرین کے لیے نہ بنائے گئے ہوں اور یہاں شامل کرنا غیر محفوظ ہو سکتا ہے۔"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"سمجھ آ گئی"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"ویجیٹس"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"مقفل اسکرین پر ویجیٹس کو شارٹ کٹ کے بطور شامل کرنے کے لیے یقینی بنائیں کہ یہ ترتیبات میں فعال ہے۔"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"صارف سوئچ کریں"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"پل ڈاؤن مینیو"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"اس سیشن میں موجود سبھی ایپس اور ڈیٹا کو حذف کر دیا جائے گا۔"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"اسپلٹ اسکرین کا استعمال کرتے ہوئے بائیں یا اوپر ایپ پر سوئچ کریں"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"اسپلٹ اسکرین کے دوران: ایک ایپ کو دوسرے سے تبدیل کریں"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"فعال ونڈو کو ڈسپلیز کے مابین منتقل کریں"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"ونڈو کو دائیں طرف منتقل کریں"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"ونڈو کو بائیں طرف منتقل کریں"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"ونڈو کو بڑا کریں"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"ونڈو کو چھوٹا کریں"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"ان پٹ"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"اگلی زبان پر سوئچ کریں"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"پچھلی زبان پر سوئچ کریں"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"سسٹم کنٹرولز"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"سسٹم ایپس"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"ملٹی ٹاسکنگ"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"حالیہ ایپس"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"اسپلٹ اسکرین"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"ان پٹ"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"ایپ شارٹ کٹس"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"کی بورڈ شارٹ کٹس"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"کی بورڈ شارٹ کٹس کو حسب ضرورت بنائیں"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"شارٹ کٹ ہٹائیں؟"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"شارٹ کٹ تفویض کرنے کے لیے کلید کو دبائیں"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"یہ آپ کا حسب ضرورت شارٹ کٹ مستقل طور پر حذف کر دے گا۔"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"تلاش کے شارٹ کٹس"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"تلاش کا کوئی نتیجہ نہیں ہے"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"آئیکن سکیڑیں"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"کارروائی یا Meta کلید کا آئیکن"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"پلس کا آئیکن"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"حسب ضرورت بنائیں"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"ہو گیا"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"آئیکن پھیلائیں"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"یا"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"پلس"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"فارورڈ سلیش"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"گھسیٹنے کا ہینڈل"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"کی بورڈ کی ترتیبات"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"شارٹ کٹ سیٹ کریں"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"ہٹائیں"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"منسوخ کریں"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"کلید کو دبائیں"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"کلیدی مجموعہ پہلے سے استعمال میں ہے۔ دوسری کلید آزمائیں۔"</string> diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml index 777be070e971..9dab9e1a8d51 100644 --- a/packages/SystemUI/res/values-uz/strings.xml +++ b/packages/SystemUI/res/values-uz/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Ilovani vidjet orqali ochish uchun shaxsingizni tasdiqlashingiz kerak. Shuningdek, planshet qulflanganda ham bu axborotlar hammaga koʻrinishini unutmang. Ayrim vidjetlar ekran qulfiga moslanmagan va ularni bu yerda chiqarish xavfli boʻlishi mumkin."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"OK"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Vidjetlar"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Ekran qulfiga yorliq sifatida vidjetlar kiritish uchun uning sozlamalarda yoqilganini tekshiring."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Foydalanuvchini almashtirish"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"tortib tushiriladigan menyu"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Ushbu seansdagi barcha ilovalar va ma’lumotlar o‘chirib tashlanadi."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Ajratilgan ekranda chapdagi yoki yuqoridagi ilovaga almashish"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ajratilgan rejimda ilovalarni oʻzaro almashtirish"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Faol oynani ekranlararo koʻchirish"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Oynani chapga surish"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Oynani oʻngga surish"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Oynani yoyish"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Oynani kichraytirish"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Kiritish"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Keyingi tilga almashtirish"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Avvalgi tilga almashtirish"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Tizim boshqaruvi tugmalari"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Tizim ilovalari"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Multi-vazifalilik"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Oxirgi ilovalar"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Ekranni ikkiga ajratish"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Kiritish"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Ilova yorliqlari"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Tezkor tugmalar"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tezkor tugmalarni moslash"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Tezkor tugma olib tashlansinmi?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Tezkor tugma sozlash uchun tugmani bosing"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Bunda maxsus tezkor tugma butunlay oʻchirib tashlanadi."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Tezkor tugmalar qidiruvi"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Hech narsa topilmadi"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Yigʻish belgisi"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Amal bajarish uchun Meta tugmasi belgisi"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Plus belgisi"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Moslash"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Tayyor"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Yoyish belgisi"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"yoki"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"plus"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"oldinga qiya chiziq"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Surish dastagi"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Klaviatura sozlamalari"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Tezkor tugma sozlash"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Olib tashlash"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Bekor qilish"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Tugmani bosing"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Bu tugmalar birikmasi band. Boshqasini ishlating."</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 6ea683a5af09..c709a31b57de 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Để dùng tiện ích mở một ứng dụng, bạn cần xác minh danh tính của mình. Ngoài ra, hãy lưu ý rằng bất kỳ ai cũng có thể xem các tiện ích này, ngay cả khi máy tính bảng của bạn được khoá. Một số tiện ích có thể không dành cho màn hình khoá và không an toàn khi thêm vào đây."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Tôi hiểu"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Tiện ích"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Để thêm Tiện ích dưới dạng lối tắt trên màn hình khoá, hãy đảm bảo bạn đã bật tính năng này trong phần cài đặt."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Chuyển đổi người dùng"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"trình đơn kéo xuống"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Tất cả ứng dụng và dữ liệu trong phiên này sẽ bị xóa."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Chuyển sang ứng dụng bên trái hoặc ở trên khi đang chia đôi màn hình"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Trong chế độ chia đôi màn hình: thay một ứng dụng bằng ứng dụng khác"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Di chuyển cửa sổ đang hoạt động giữa các màn hình"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Di chuyển cửa sổ sang trái"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Di chuyển cửa sổ sang phải"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Phóng to cửa sổ"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Thu nhỏ cửa sổ"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Đầu vào"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Chuyển sang ngôn ngữ tiếp theo"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Chuyển về ngôn ngữ trước"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Điều khiển hệ thống"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Ứng dụng hệ thống"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Đa nhiệm"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Ứng dụng gần đây"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Chia đôi màn hình"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Phương thức nhập"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Lối tắt ứng dụng"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Phím tắt"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Tuỳ chỉnh phím tắt"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Xoá lối tắt?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Nhấn phím để chỉ định lối tắt"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Thao tác này sẽ xoá vĩnh viễn lối tắt tuỳ chỉnh của bạn."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Tìm lối tắt"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Không có kết quả tìm kiếm nào"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Biểu tượng Thu gọn"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Biểu tượng phím Meta (phím hành động)"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Biểu tượng dấu cộng"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Tuỳ chỉnh"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Xong"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Biểu tượng Mở rộng"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"hoặc"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"dấu cộng"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"dấu gạch chéo lên"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Nút kéo"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Cài đặt bàn phím"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Đặt phím tắt"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Xoá"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Huỷ"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Nhấn phím"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Tổ hợp phím đã được sử dụng. Hãy thử một phím khác."</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index bc9c31849549..a10650716c00 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"若要使用微件打开应用，您需要验证是您本人在操作。另外请注意，任何人都可以查看此类微件，即使您的平板电脑已锁定。有些微件可能不适合显示在锁定的屏幕中，因此添加到这里可能不安全。"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"知道了"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"微件"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"如要将微件作为快捷方式添加到锁屏界面，请确保已在设置中启用该功能。"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"切换用户"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"下拉菜单"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"此会话中的所有应用和数据都将被删除。"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分屏模式时，切换到左侧或上方的应用"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"在分屏期间：将一个应用替换为另一个应用"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"在各个显示屏之间移动活动窗口"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"将窗口移至左侧"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"将窗口移至右侧"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"最大化窗口"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"最小化窗口"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"输入"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"切换到下一种语言"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"切换到上一种语言"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"系统控件"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"系统应用"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"多任务处理"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"最近用过的应用"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"分屏"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"输入"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"应用快捷键"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"键盘快捷键"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"自定义键盘快捷键"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"要移除快捷键吗？"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"按下按键即可指定快捷键"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"此操作会永久删除您的自定义快捷键。"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜索快捷键"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"无搜索结果"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收起图标"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"操作键或元键图标"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"加号图标"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"自定义"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"完成"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展开图标"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"或"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"加号"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"正斜线"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"拖动手柄"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"键盘设置"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"设置快捷键"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"移除"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"取消"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"按下按键"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"按键组合已被使用，请尝试使用其他按键。"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 21477431d8fc..afbd4118f6ca 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -449,8 +449,8 @@ <string name="zen_modes_dialog_title" msgid="8854640808100096934">"模式"</string> <string name="zen_modes_dialog_done" msgid="6654130880256438950">"完成"</string> <string name="zen_modes_dialog_settings" msgid="2310248023728936697">"設定"</string> - <string name="zen_mode_on" msgid="9085304934016242591">"開啟"</string> - <string name="zen_mode_on_with_details" msgid="7416143430557895497">"開 • <xliff:g id="TRIGGER_DESCRIPTION">%1$s</xliff:g>"</string> + <string name="zen_mode_on" msgid="9085304934016242591">"已開啟"</string> + <string name="zen_mode_on_with_details" msgid="7416143430557895497">"已開啟 • <xliff:g id="TRIGGER_DESCRIPTION">%1$s</xliff:g>"</string> <string name="zen_mode_off" msgid="1736604456618147306">"關閉"</string> <string name="zen_mode_set_up" msgid="8231201163894922821">"未設定"</string> <string name="zen_mode_no_manual_invocation" msgid="1769975741344633672">"在「設定」中管理"</string> @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"如要使用小工具開啟應用程式，系統會要求你驗證身分。請注意，所有人都能查看小工具，即使平板電腦已鎖定亦然。部分小工具可能不適用於上鎖畫面，新增至這裡可能會有安全疑慮。"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"知道了"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"小工具"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"如要將小工具新增為上鎖畫面上的捷徑，請確認已在設定中啟用此功能。"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"切換使用者"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"下拉式選單"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"這個工作階段中的所有應用程式和資料都會被刪除。"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分割螢幕時，切換至左邊或上方的應用程式"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"使用分割螢幕期間：更換應用程式"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"在不同畫面間移動使用中的視窗"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"將視窗移到左邊"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"將視窗移到右邊"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"將視窗放到最大"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"將視窗縮到最小"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"輸入"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"切換至下一個語言"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"切換至上一個語言"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"系統控制項"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"系統應用程式"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"多工處理"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"最近使用的應用程式"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"分割螢幕"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"輸入"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"應用程式捷徑"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"鍵盤快速鍵"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"自訂鍵盤快速鍵"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"要移除快速鍵嗎？"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"按鍵即可指派快速鍵"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"這將永久刪除你的自訂快速鍵。"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜尋快速鍵"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"沒有相符的搜尋結果"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收合圖示"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"快捷操作鍵或修飾鍵圖示"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"加號圖示"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"自訂"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"完成"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展開圖示"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"或"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"加"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"正斜線"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"拖曳控點"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"鍵盤設定"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"設定快速鍵"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"移除"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"取消"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"按鍵"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"此按鍵組合已在使用，請改用其他按鍵。"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 13fb81c64450..03d70e145068 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"如要使用小工具開啟應用程式，需先驗證身分。請留意，即使平板電腦已鎖定，所有人都還是能查看小工具。某些小工具可能不適用於螢幕鎖定畫面，新增到此可能會有安全疑慮。"</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"我知道了"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"小工具"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"如要將小工具新增為螢幕鎖定畫面上的捷徑，請確認已在設定中啟用這項功能。"</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"切換使用者"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"下拉式選單"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"這個工作階段中的所有應用程式和資料都會刪除。"</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"使用分割畫面時，切換到左邊或上方的應用程式"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"使用分割畫面期間：更換應用程式"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"在不同畫面間移動使用中的視窗"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"將視窗移至左側"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"將視窗移至右側"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"將視窗放到最大"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"將視窗縮到最小"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"輸入"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"切換到下一個語言"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"切換到上一個語言"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"系統控制選項"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"系統應用程式"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"多工處理"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"最近使用的應用程式"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"分割畫面"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"輸入"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"應用程式捷徑"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"鍵盤快速鍵"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"自訂鍵盤快速鍵"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"要移除快速鍵嗎？"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"按下按鍵即可指派快速鍵"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"這項操作會永久刪除自訂快速鍵。"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"搜尋快速鍵"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"找不到相符的搜尋結果"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"收合圖示"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"快捷操作鍵或修飾鍵圖示"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"加號圖示"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"自訂"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"完成"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"展開圖示"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"或"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"加"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"斜線"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"拖曳控點"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"鍵盤設定"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"設定快速鍵"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"移除"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"取消"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"按下按鍵"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"這個按鍵組合已在使用中，請改用其他按鍵。"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index f3230218ca65..b39c3e9a625b 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -529,7 +529,10 @@ <string name="communal_widgets_disclaimer_text" msgid="1423545475160506349">"Ukuze uvule i-app usebenzisa iwijethi, uzodinga ukuqinisekisa ukuthi nguwe. Futhi, khumbula ukuthi noma ubani angakwazi ukuzibuka, nanoma ithebhulethi yakho ikhiyiwe. Amanye amawijethi kungenzeka abengahloselwe ukukhiya isikrini sakho futhi kungenzeka awaphephile ukuthi angafakwa lapha."</string> <string name="communal_widgets_disclaimer_button" msgid="4423059765740780753">"Ngiyezwa"</string> <string name="glanceable_hub_lockscreen_affordance_label" msgid="1461611028615752141">"Amawijethi"</string> - <string name="glanceable_hub_lockscreen_affordance_disabled_text" msgid="511359420883794513">"Ukufaka Amawijethi esikrinini sokukhiya njengesinqamuleli, qinisekisa ukuthi inikwe amandla kumasethingi."</string> + <!-- no translation found for glanceable_hub_lockscreen_affordance_disabled_text (599170482297578735) --> + <skip /> + <!-- no translation found for glanceable_hub_lockscreen_affordance_action_button_label (7636151133344609375) --> + <skip /> <string name="accessibility_multi_user_switch_switcher" msgid="5330448341251092660">"Shintsha umsebenzisi"</string> <string name="accessibility_multi_user_list_switcher" msgid="8574105376229857407">"imenyu yokudonsela phansi"</string> <string name="guest_exit_guest_dialog_message" msgid="8183450985628495709">"Wonke ama-app nedatha kulesi sikhathi azosuswa."</string> @@ -875,14 +878,10 @@ <string name="system_multitasking_splitscreen_focus_lhs" msgid="3164261844398662518">"Shintshela ku-app ngakwesokunxele noma ngaphezulu ngenkathi usebenzisa ukuhlukanisa isikrini"</string> <string name="system_multitasking_replace" msgid="7410071959803642125">"Ngesikhathi sokuhlukaniswa kwesikrini: shintsha i-app ngenye"</string> <string name="system_multitasking_move_to_next_display" msgid="6169737557526976997">"Hambisa iwindi elisebenzayo phakathi kwezibonisi"</string> - <!-- no translation found for system_desktop_mode_snap_left_window (8636204689945162298) --> - <skip /> - <!-- no translation found for system_desktop_mode_snap_right_window (2162560187639411929) --> - <skip /> - <!-- no translation found for system_desktop_mode_toggle_maximize_window (4084100093691768239) --> - <skip /> - <!-- no translation found for system_desktop_mode_minimize_window (1248714536732927092) --> - <skip /> + <string name="system_desktop_mode_snap_left_window" msgid="8636204689945162298">"Hambisa iwindi liye kwesokudla"</string> + <string name="system_desktop_mode_snap_right_window" msgid="2162560187639411929">"Hambisa iwindi liye kwesokudla"</string> + <string name="system_desktop_mode_toggle_maximize_window" msgid="4084100093691768239">"Khulisa iwindi"</string> + <string name="system_desktop_mode_minimize_window" msgid="1248714536732927092">"Nciphisa iwindi"</string> <string name="keyboard_shortcut_group_input" msgid="6888282716546625610">"Okokufaka"</string> <string name="input_switch_input_language_next" msgid="3782155659868227855">"Shintshela olimini olulandelayo"</string> <string name="input_switch_input_language_previous" msgid="6043341362202336623">"Shintshela olimini lwangaphambili"</string> @@ -1419,7 +1418,6 @@ <string name="shortcut_helper_category_system_controls" msgid="3153344561395751020">"Izilawuli zesistimu"</string> <string name="shortcut_helper_category_system_apps" msgid="6001757545472556810">"Ama-app esistimu"</string> <string name="shortcut_helper_category_multitasking" msgid="7413381961404090136">"Ukwenza imisebenzi eminingi"</string> - <string name="shortcutHelper_category_recent_apps" msgid="7918731953612377145">"Ama-app wakamuva"</string> <string name="shortcutHelper_category_split_screen" msgid="1159669813444812244">"Hlukanisa isikrini"</string> <string name="shortcut_helper_category_input" msgid="8674018654124839566">"Okokufaka"</string> <string name="shortcut_helper_category_app_shortcuts" msgid="8010249408308587117">"Izinqamuleli Zohlelo lokusebenza"</string> @@ -1428,25 +1426,31 @@ <string name="shortcut_helper_title" msgid="8567500639300970049">"Izinqamuleli zekhibhodi"</string> <string name="shortcut_helper_customize_mode_title" msgid="1467657117101096033">"Hlela izinqamuleli zekhibhodi ngendlela oyifisayo"</string> <string name="shortcut_customize_mode_remove_shortcut_dialog_title" msgid="7106420484940737208">"Susa isinqamuleli?"</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_dialog_title (8131184731313717780) --> + <skip /> <string name="shortcut_customize_mode_add_shortcut_description" msgid="6866025005347407696">"Cindezela ukhiye ukuze unikeze isinqamuleli"</string> <string name="shortcut_customize_mode_remove_shortcut_description" msgid="6851287900585057128">"Lokhu kuzosula isinqamuleli sakho somuntu ngamunye unomphela."</string> + <!-- no translation found for shortcut_customize_mode_reset_shortcut_description (2081849715634358684) --> + <skip /> <string name="shortcut_helper_search_placeholder" msgid="5488547526269871819">"Sesha izinqamuleli"</string> <string name="shortcut_helper_no_search_results" msgid="8554756497996692160">"Ayikho imiphumela yosesho"</string> <string name="shortcut_helper_content_description_collapse_icon" msgid="8028015738431664954">"Goqa isithonjana"</string> <string name="shortcut_helper_content_description_meta_key" msgid="3989315044342124818">"Isithonjana sesenzo noma seMeta"</string> <string name="shortcut_helper_content_description_plus_icon" msgid="6152683734278299020">"Isithonjana sesengezo"</string> <string name="shortcut_helper_customize_button_text" msgid="3124983502748069338">"Enza ngendlela oyifisayo"</string> + <!-- no translation found for shortcut_helper_reset_button_text (2548243844050633472) --> + <skip /> <string name="shortcut_helper_done_button_text" msgid="7249905942125386191">"Kwenziwe"</string> <string name="shortcut_helper_content_description_expand_icon" msgid="1084435697860417390">"Nweba isithonjana"</string> <string name="shortcut_helper_key_combinations_or_separator" msgid="7082902112102125540">"noma"</string> - <!-- no translation found for shortcut_helper_key_combinations_and_conjunction (6138186504075880224) --> - <skip /> - <!-- no translation found for shortcut_helper_key_combinations_forward_slash (1238652537199346970) --> - <skip /> + <string name="shortcut_helper_key_combinations_and_conjunction" msgid="6138186504075880224">"hlanganisa"</string> + <string name="shortcut_helper_key_combinations_forward_slash" msgid="1238652537199346970">"umugqa otshekele phambili"</string> <string name="shortcut_helper_content_description_drag_handle" msgid="5092426406009848110">"Hudula isibambi"</string> <string name="shortcut_helper_keyboard_settings_buttons_label" msgid="6720967595915985259">"Amasethingi Ekhibhodi"</string> <string name="shortcut_helper_customize_dialog_set_shortcut_button_label" msgid="4754492225010429382">"Setha isinqamuleli"</string> <string name="shortcut_helper_customize_dialog_remove_button_label" msgid="6546386970440176552">"Susa"</string> + <!-- no translation found for shortcut_helper_customize_dialog_reset_button_label (7645535254306312685) --> + <skip /> <string name="shortcut_helper_customize_dialog_cancel_button_label" msgid="5595546460431741178">"Khansela"</string> <string name="shortcut_helper_add_shortcut_dialog_placeholder" msgid="9154297849458741995">"Cindezela ukhiye"</string> <string name="shortcut_customizer_key_combination_in_use_error_message" msgid="7693234470526626327">"Inhlanganisela yokhiye isiyasetshenziswa kakade. Zama omunye ukhiye."</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 42e909244f84..113f3d2bc35e 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -172,6 +172,9 @@ <!-- Minimum display time for a heads up notification, in milliseconds. --> <integer name="heads_up_notification_minimum_time">2000</integer> + <!-- Minimum display time for a heads up notification if throttling is enabled, in milliseconds. --> + <integer name="heads_up_notification_minimum_time_with_throttling">500</integer> + <!-- Display time for a sticky heads up notification, in milliseconds. --> <integer name="sticky_heads_up_notification_time">60000</integer> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index a0a61c74369f..e417da4d8815 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1336,10 +1336,12 @@ <string name="communal_widgets_disclaimer_text">To open an app using a widget, you\u2019ll need to verify it\u2019s you. Also, keep in mind that anyone can view them, even when your tablet\u2019s locked. Some widgets may not have been intended for your lock screen and may be unsafe to add here.</string> <!-- Button for user to verify they understand the information presented. [CHAR LIMIT=50] --> <string name="communal_widgets_disclaimer_button">Got it</string> - <!-- Lockscreen affordance to open glanceable hub. [CHAR LIMIT=20] --> + <!-- Label for a lock screen affordance to show widgets on the lock screen. [CHAR LIMIT=20] --> <string name="glanceable_hub_lockscreen_affordance_label">Widgets</string> - <!-- Text explaining that the glanceable hub affordance is disabled. [CHAR LIMIT=NONE] --> - <string name="glanceable_hub_lockscreen_affordance_disabled_text">To add Widgets on the lock screen as a shortcut, make sure it is enabled in settings.</string> + <!-- Text explaining why the lock screen affordance to show widgets on the lockscreen is disabled and how to enable the affordance in settings. [CHAR LIMIT=NONE] --> + <string name="glanceable_hub_lockscreen_affordance_disabled_text">To add the \"Widgets\" shortcut, make sure \"Show widgets on lock screen\" is enabled in settings.</string> + <!-- Label for a button used to open Settings in order to enable showing widgets on the lock screen. [CHAR LIMIT=NONE] --> + <string name="glanceable_hub_lockscreen_affordance_action_button_label">Settings</string> <!-- Related to user switcher --><skip/> @@ -3812,6 +3814,9 @@ shortcut helper The helper is a component that shows the user which keyboard shortcuts they can use. [CHAR LIMIT=NONE] --> <string name="shortcut_helper_customize_button_text">Customize</string> + <!-- Description text of the button that allows user to resets all custom shortcuts in keyboard + shortcut helper when in customization mode. [CHAR LIMIT=NONE] --> + <string name="shortcut_helper_reset_button_text">Reset</string> <!-- Description text of the button that allows user to exit shortcut customization mode in keyboard shortcut helper The helper is a component that shows the user which keyboard shortcuts they can use. [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/schemas/com.android.systemui.communal.data.db.CommunalDatabase/5.json b/packages/SystemUI/schemas/com.android.systemui.communal.data.db.CommunalDatabase/5.json new file mode 100644 index 000000000000..c5a83c4d0d8c --- /dev/null +++ b/packages/SystemUI/schemas/com.android.systemui.communal.data.db.CommunalDatabase/5.json @@ -0,0 +1,95 @@ +{ + "formatVersion": 1, + "database": { + "version": 5, + "identityHash": "a83f96ef4babe730b3a00e8acb777a25", + "entities": [ + { + "tableName": "communal_widget_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `widget_id` INTEGER NOT NULL, `component_name` TEXT NOT NULL, `item_id` INTEGER NOT NULL, `user_serial_number` INTEGER NOT NULL DEFAULT -1, `span_y` INTEGER NOT NULL DEFAULT 3, `span_y_new` INTEGER NOT NULL DEFAULT 1)", + "fields": [ + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "widgetId", + "columnName": "widget_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "componentName", + "columnName": "component_name", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "itemId", + "columnName": "item_id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "userSerialNumber", + "columnName": "user_serial_number", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "-1" + }, + { + "fieldPath": "spanY", + "columnName": "span_y", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "3" + }, + { + "fieldPath": "spanYNew", + "columnName": "span_y_new", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "1" + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "uid" + ] + } + }, + { + "tableName": "communal_item_rank_table", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `rank` INTEGER NOT NULL DEFAULT 0)", + "fields": [ + { + "fieldPath": "uid", + "columnName": "uid", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "rank", + "columnName": "rank", + "affinity": "INTEGER", + "notNull": true, + "defaultValue": "0" + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "uid" + ] + } + } + ], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'a83f96ef4babe730b3a00e8acb777a25')" + ] + } +}
\ No newline at end of file diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java index ab611901328d..fc536bdb126b 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/QuickStepContract.java @@ -25,9 +25,17 @@ import static com.android.systemui.shared.Flags.shadeAllowBackGesture; import android.annotation.LongDef; import android.content.Context; import android.content.res.Resources; +import android.os.Bundle; +import android.os.IBinder; +import android.os.IInterface; +import android.os.RemoteException; +import android.util.Log; import android.view.ViewConfiguration; import android.view.WindowManagerPolicyConstants; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.policy.ScreenDecorationsUtils; import java.lang.annotation.Retention; @@ -39,10 +47,7 @@ import java.util.StringJoiner; */ public class QuickStepContract { - public static final String KEY_EXTRA_SYSUI_PROXY = "extra_sysui_proxy"; - public static final String KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER = "extra_unfold_animation"; - // See ISysuiUnlockAnimationController.aidl - public static final String KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER = "unlock_animation"; + private static final String TAG = "QuickStepContract"; public static final String NAV_BAR_MODE_3BUTTON_OVERLAY = WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY; @@ -412,4 +417,20 @@ public class QuickStepContract { public static boolean supportsRoundedCornersOnWindows(Resources resources) { return ScreenDecorationsUtils.supportsRoundedCornersOnWindows(resources); } + + /** + * Adds the provided interface to the bundle using the interface descriptor as the key + */ + public static void addInterface(@Nullable IInterface iInterface, @NonNull Bundle out) { + if (iInterface != null) { + IBinder binder = iInterface.asBinder(); + if (binder != null) { + try { + out.putIBinder(binder.getInterfaceDescriptor(), binder); + } catch (RemoteException e) { + Log.d(TAG, "Invalid interface description " + binder, e); + } + } + } + } } diff --git a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt index 071cf8a46b9f..5af80cbd4b29 100644 --- a/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt +++ b/packages/SystemUI/src/com/android/keyguard/ClockEventController.kt @@ -63,6 +63,7 @@ import com.android.systemui.plugins.clocks.WeatherData import com.android.systemui.plugins.clocks.ZenData import com.android.systemui.plugins.clocks.ZenData.ZenMode import com.android.systemui.res.R as SysuiR +import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.settings.UserTracker import com.android.systemui.shared.regionsampling.RegionSampler import com.android.systemui.statusbar.policy.BatteryController @@ -466,6 +467,15 @@ constructor( batteryController.addCallback(batteryCallback) keyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback) zenModeController.addCallback(zenModeCallback) + if (SceneContainerFlag.isEnabled) { + handleDoze( + when (AOD) { + keyguardTransitionInteractor.getCurrentState() -> 1f + keyguardTransitionInteractor.getStartedState() -> 1f + else -> 0f + } + ) + } disposableHandle = parent.repeatWhenAttached { repeatOnLifecycle(Lifecycle.State.CREATED) { diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java index 1f21af80cebb..ad12229fe4e7 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesDialogDelegate.java @@ -55,7 +55,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import com.android.settingslib.bluetooth.HapClientProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import com.android.systemui.accessibility.hearingaid.HearingDevicesListAdapter.HearingDeviceItemCallback; @@ -67,7 +66,6 @@ import com.android.systemui.bluetooth.qsdialog.DeviceItem; import com.android.systemui.bluetooth.qsdialog.DeviceItemFactory; import com.android.systemui.bluetooth.qsdialog.DeviceItemType; import com.android.systemui.bluetooth.qsdialog.SavedHearingDeviceItemFactory; -import com.android.systemui.dagger.qualifiers.Application; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.res.R; @@ -87,6 +85,7 @@ import java.util.stream.Collectors; */ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, HearingDeviceItemCallback, BluetoothCallback { + private static final String TAG = "HearingDevicesDialogDelegate"; @VisibleForTesting static final String ACTION_BLUETOOTH_DEVICE_DETAILS = @@ -96,25 +95,27 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, @VisibleForTesting static final Intent LIVE_CAPTION_INTENT = new Intent( "com.android.settings.action.live_caption"); + private final SystemUIDialog.Factory mSystemUIDialogFactory; private final DialogTransitionAnimator mDialogTransitionAnimator; private final ActivityStarter mActivityStarter; - private final boolean mShowPairNewDevice; private final LocalBluetoothManager mLocalBluetoothManager; private final Handler mMainHandler; private final AudioManager mAudioManager; private final LocalBluetoothProfileManager mProfileManager; - private final HapClientProfile mHapClientProfile; private final HearingDevicesUiEventLogger mUiEventLogger; + private final boolean mShowPairNewDevice; private final int mLaunchSourceId; - private HearingDevicesListAdapter mDeviceListAdapter; - private HearingDevicesPresetsController mPresetsController; - private Context mApplicationContext; + private SystemUIDialog mDialog; + private RecyclerView mDeviceList; private List<DeviceItem> mHearingDeviceItemList; + private HearingDevicesListAdapter mDeviceListAdapter; + private View mPresetLayout; private Spinner mPresetSpinner; + private HearingDevicesPresetsController mPresetController; private HearingDevicesSpinnerAdapter mPresetInfoAdapter; private final HearingDevicesPresetsController.PresetCallback mPresetCallback = new HearingDevicesPresetsController.PresetCallback() { @@ -122,20 +123,18 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, public void onPresetInfoUpdated(List<BluetoothHapPresetInfo> presetInfos, int activePresetIndex) { mMainHandler.post( - () -> refreshPresetInfoAdapter(presetInfos, activePresetIndex)); + () -> refreshPresetUi(presetInfos, activePresetIndex)); } @Override public void onPresetCommandFailed(int reason) { - final List<BluetoothHapPresetInfo> presetInfos = - mPresetsController.getAllPresetInfo(); - final int activePresetIndex = mPresetsController.getActivePresetIndex(); + mPresetController.refreshPresetInfo(); mMainHandler.post(() -> { - refreshPresetInfoAdapter(presetInfos, activePresetIndex); - showPresetErrorToast(mApplicationContext); + showErrorToast(R.string.hearing_devices_presets_error); }); } }; + private final List<DeviceItemFactory> mHearingDeviceItemFactoryList = List.of( new ActiveHearingDeviceItemFactory(), new AvailableHearingDeviceItemFactory(), @@ -159,7 +158,6 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, @AssistedInject public HearingDevicesDialogDelegate( - @Application Context applicationContext, @Assisted boolean showPairNewDevice, @Assisted @HearingDevicesUiEventLogger.LaunchSourceId int launchSourceId, SystemUIDialog.Factory systemUIDialogFactory, @@ -169,7 +167,6 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, @Main Handler handler, AudioManager audioManager, HearingDevicesUiEventLogger uiEventLogger) { - mApplicationContext = applicationContext; mShowPairNewDevice = showPairNewDevice; mSystemUIDialogFactory = systemUIDialogFactory; mActivityStarter = activityStarter; @@ -178,7 +175,6 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, mMainHandler = handler; mAudioManager = audioManager; mProfileManager = localBluetoothManager.getProfileManager(); - mHapClientProfile = mProfileManager.getHapClientProfile(); mUiEventLogger = uiEventLogger; mLaunchSourceId = launchSourceId; } @@ -229,38 +225,26 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, @Override public void onActiveDeviceChanged(@Nullable CachedBluetoothDevice activeDevice, int bluetoothProfile) { - CachedBluetoothDevice activeHearingDevice; - mHearingDeviceItemList = getHearingDevicesList(); - if (mPresetsController != null) { - activeHearingDevice = getActiveHearingDevice(mHearingDeviceItemList); - mPresetsController.setHearingDeviceIfSupportHap(activeHearingDevice); - } else { - activeHearingDevice = null; + refreshDeviceUi(); + if (mPresetController != null) { + mPresetController.setDevice(getActiveHearingDevice()); + mMainHandler.post(() -> { + mPresetLayout.setVisibility( + mPresetController.isPresetControlAvailable() ? VISIBLE : GONE); + }); } - mMainHandler.post(() -> { - mDeviceListAdapter.refreshDeviceItemList(mHearingDeviceItemList); - final List<BluetoothHapPresetInfo> presetInfos = - mPresetsController.getAllPresetInfo(); - final int activePresetIndex = mPresetsController.getActivePresetIndex(); - refreshPresetInfoAdapter(presetInfos, activePresetIndex); - mPresetLayout.setVisibility( - (activeHearingDevice != null && activeHearingDevice.isConnectedHapClientDevice() - && !mPresetInfoAdapter.isEmpty()) ? VISIBLE : GONE); - }); } @Override public void onProfileConnectionStateChanged(@NonNull CachedBluetoothDevice cachedDevice, int state, int bluetoothProfile) { - mHearingDeviceItemList = getHearingDevicesList(); - mMainHandler.post(() -> mDeviceListAdapter.refreshDeviceItemList(mHearingDeviceItemList)); + refreshDeviceUi(); } @Override public void onAclConnectionStateChanged(@NonNull CachedBluetoothDevice cachedDevice, int state) { - mHearingDeviceItemList = getHearingDevicesList(); - mMainHandler.post(() -> mDeviceListAdapter.refreshDeviceItemList(mHearingDeviceItemList)); + refreshDeviceUi(); } @Override @@ -306,13 +290,9 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, if (mLocalBluetoothManager == null) { return; } - mLocalBluetoothManager.getEventManager().registerCallback(this); - if (mPresetsController != null) { - mPresetsController.registerHapCallback(); - if (mHapClientProfile != null && !mHapClientProfile.isProfileReady()) { - mProfileManager.addServiceListener(mPresetsController); - } + if (mPresetController != null) { + mPresetController.registerHapCallback(); } } @@ -322,37 +302,25 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, return; } - if (mPresetsController != null) { - mPresetsController.unregisterHapCallback(); - mProfileManager.removeServiceListener(mPresetsController); + if (mPresetController != null) { + mPresetController.unregisterHapCallback(); } mLocalBluetoothManager.getEventManager().unregisterCallback(this); } - @VisibleForTesting - void setHearingDevicesPresetsController(HearingDevicesPresetsController controller) { - mPresetsController = controller; - } - private void setupDeviceListView(SystemUIDialog dialog) { mDeviceList.setLayoutManager(new LinearLayoutManager(dialog.getContext())); - mHearingDeviceItemList = getHearingDevicesList(); + mHearingDeviceItemList = getHearingDeviceItemList(); mDeviceListAdapter = new HearingDevicesListAdapter(mHearingDeviceItemList, this); mDeviceList.setAdapter(mDeviceListAdapter); } private void setupPresetSpinner(SystemUIDialog dialog) { - if (mPresetsController == null) { - mPresetsController = new HearingDevicesPresetsController(mProfileManager, - mPresetCallback); - } - final CachedBluetoothDevice activeHearingDevice = getActiveHearingDevice( - mHearingDeviceItemList); - mPresetsController.setHearingDeviceIfSupportHap(activeHearingDevice); + mPresetController = new HearingDevicesPresetsController(mProfileManager, mPresetCallback); + mPresetController.setDevice(getActiveHearingDevice()); mPresetInfoAdapter = new HearingDevicesSpinnerAdapter(dialog.getContext()); mPresetSpinner.setAdapter(mPresetInfoAdapter); - // disable redundant Touch & Hold accessibility action for Switch Access mPresetSpinner.setAccessibilityDelegate(new View.AccessibilityDelegate() { @Override @@ -362,20 +330,18 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, super.onInitializeAccessibilityNodeInfo(host, info); } }); - - // Refresh the spinner and setSelection(index, false) before setOnItemSelectedListener() to - // avoid extra onItemSelected() get called when first register the listener. - final List<BluetoothHapPresetInfo> presetInfos = mPresetsController.getAllPresetInfo(); - final int activePresetIndex = mPresetsController.getActivePresetIndex(); - refreshPresetInfoAdapter(presetInfos, activePresetIndex); + // Should call setSelection(index, false) for the spinner before setOnItemSelectedListener() + // to avoid extra onItemSelected() get called when first register the listener. + refreshPresetUi(mPresetController.getAllPresetInfo(), + mPresetController.getActivePresetIndex()); mPresetSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { mPresetInfoAdapter.setSelected(position); mUiEventLogger.log(HearingDevicesUiEvent.HEARING_DEVICES_PRESET_SELECT, mLaunchSourceId); - mPresetsController.selectPreset( - mPresetsController.getAllPresetInfo().get(position).getIndex()); + mPresetController.selectPreset( + mPresetController.getAllPresetInfo().get(position).getIndex()); } @Override @@ -383,9 +349,8 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, // Do nothing } }); - mPresetLayout.setVisibility( - (activeHearingDevice != null && activeHearingDevice.isConnectedHapClientDevice() - && !mPresetInfoAdapter.isEmpty()) ? VISIBLE : GONE); + + mPresetLayout.setVisibility(mPresetController.isPresetControlAvailable() ? VISIBLE : GONE); } private void setupPairNewDeviceButton(SystemUIDialog dialog) { @@ -405,13 +370,12 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, } private void setupRelatedToolsView(SystemUIDialog dialog) { - final Context context = dialog.getContext(); final List<ToolItem> toolItemList = new ArrayList<>(); final String[] toolNameArray; final String[] toolIconArray; - ToolItem preInstalledItem = getLiveCaption(context); + ToolItem preInstalledItem = getLiveCaptionToolItem(context); if (preInstalledItem != null) { toolItemList.add(preInstalledItem); } @@ -432,7 +396,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, final LinearLayout toolsContainer = dialog.requireViewById(R.id.tools_container); for (int i = 0; i < toolItemList.size(); i++) { - View view = createHearingToolView(context, toolItemList.get(i), toolsContainer); + View view = createToolView(context, toolItemList.get(i), toolsContainer); toolsContainer.addView(view); if (i != toolItemList.size() - 1) { final int spaceSize = context.getResources().getDimensionPixelSize( @@ -444,8 +408,14 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, } } - private void refreshPresetInfoAdapter(List<BluetoothHapPresetInfo> presetInfos, - int activePresetIndex) { + private void refreshDeviceUi() { + mHearingDeviceItemList = getHearingDeviceItemList(); + mMainHandler.post(() -> { + mDeviceListAdapter.refreshDeviceItemList(mHearingDeviceItemList); + }); + } + + private void refreshPresetUi(List<BluetoothHapPresetInfo> presetInfos, int activePresetIndex) { mPresetInfoAdapter.clear(); mPresetInfoAdapter.addAll( presetInfos.stream().map(BluetoothHapPresetInfo::getName).toList()); @@ -460,12 +430,11 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, } } - private List<DeviceItem> getHearingDevicesList() { + private List<DeviceItem> getHearingDeviceItemList() { if (mLocalBluetoothManager == null || !mLocalBluetoothManager.getBluetoothAdapter().isEnabled()) { return emptyList(); } - return mLocalBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy().stream() .map(this::createHearingDeviceItem) .filter(Objects::nonNull) @@ -473,8 +442,8 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, } @Nullable - private CachedBluetoothDevice getActiveHearingDevice(List<DeviceItem> hearingDeviceItemList) { - return hearingDeviceItemList.stream() + private CachedBluetoothDevice getActiveHearingDevice() { + return mHearingDeviceItemList.stream() .filter(item -> item.getType() == DeviceItemType.ACTIVE_MEDIA_BLUETOOTH_DEVICE) .map(DeviceItem::getCachedBluetoothDevice) .findFirst() @@ -495,7 +464,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, } @NonNull - private View createHearingToolView(Context context, ToolItem item, ViewGroup container) { + private View createToolView(Context context, ToolItem item, ViewGroup container) { View view = LayoutInflater.from(context).inflate(R.layout.hearing_tool_item, container, false); ImageView icon = view.requireViewById(R.id.tool_icon); @@ -522,7 +491,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, return view; } - private ToolItem getLiveCaption(Context context) { + private ToolItem getLiveCaptionToolItem(Context context) { final PackageManager packageManager = context.getPackageManager(); LIVE_CAPTION_INTENT.setPackage(packageManager.getSystemCaptionsServicePackageName()); final List<ResolveInfo> resolved = packageManager.queryIntentActivities(LIVE_CAPTION_INTENT, @@ -534,7 +503,6 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, LIVE_CAPTION_INTENT, /* isCustomIcon= */ true); } - return null; } @@ -544,7 +512,7 @@ public class HearingDevicesDialogDelegate implements SystemUIDialog.Delegate, } } - private void showPresetErrorToast(Context context) { - Toast.makeText(context, R.string.hearing_devices_presets_error, Toast.LENGTH_SHORT).show(); + private void showErrorToast(int stringResId) { + Toast.makeText(mDialog.getContext(), stringResId, Toast.LENGTH_SHORT).show(); } } diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesPresetsController.java b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesPresetsController.java index aa95fd038260..e109108d7df5 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesPresetsController.java +++ b/packages/SystemUI/src/com/android/systemui/accessibility/hearingaid/HearingDevicesPresetsController.java @@ -25,16 +25,18 @@ import android.bluetooth.BluetoothHapPresetInfo; import android.util.Log; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.HapClientProfile; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; import com.android.settingslib.utils.ThreadUtils; +import java.util.ArrayList; import java.util.List; /** - * The controller of the hearing devices presets of the bluetooth Hearing Access Profile. + * The controller of handling hearing device preset with Bluetooth Hearing Access Profile(HAP). */ public class HearingDevicesPresetsController implements LocalBluetoothProfileManager.ServiceListener, BluetoothHapClient.Callback { @@ -46,11 +48,13 @@ public class HearingDevicesPresetsController implements private final HapClientProfile mHapClientProfile; private final PresetCallback mPresetCallback; - private CachedBluetoothDevice mActiveHearingDevice; + private CachedBluetoothDevice mDevice; + private List<BluetoothHapPresetInfo> mPresetInfos = new ArrayList<>(); + private int mActivePresetIndex = BluetoothHapClient.PRESET_INDEX_UNAVAILABLE; private int mSelectedPresetIndex; - public HearingDevicesPresetsController(LocalBluetoothProfileManager profileManager, - PresetCallback presetCallback) { + public HearingDevicesPresetsController(@NonNull LocalBluetoothProfileManager profileManager, + @Nullable PresetCallback presetCallback) { mProfileManager = profileManager; mHapClientProfile = mProfileManager.getHapClientProfile(); mPresetCallback = presetCallback; @@ -61,7 +65,7 @@ public class HearingDevicesPresetsController implements if (mHapClientProfile != null && mHapClientProfile.isProfileReady()) { mProfileManager.removeServiceListener(this); registerHapCallback(); - mPresetCallback.onPresetInfoUpdated(getAllPresetInfo(), getActivePresetIndex()); + refreshPresetInfo(); } } @@ -72,51 +76,53 @@ public class HearingDevicesPresetsController implements @Override public void onPresetSelected(@NonNull BluetoothDevice device, int presetIndex, int reason) { - if (mActiveHearingDevice == null) { + if (mDevice == null) { return; } - if (device.equals(mActiveHearingDevice.getDevice())) { + if (device.equals(mDevice.getDevice())) { if (DEBUG) { Log.d(TAG, "onPresetSelected, device: " + device.getAddress() + ", presetIndex: " + presetIndex + ", reason: " + reason); } - mPresetCallback.onPresetInfoUpdated(getAllPresetInfo(), getActivePresetIndex()); + refreshPresetInfo(); } } @Override public void onPresetInfoChanged(@NonNull BluetoothDevice device, @NonNull List<BluetoothHapPresetInfo> presetInfoList, int reason) { - if (mActiveHearingDevice == null) { + if (mDevice == null) { return; } - if (device.equals(mActiveHearingDevice.getDevice())) { + if (device.equals(mDevice.getDevice())) { if (DEBUG) { Log.d(TAG, "onPresetInfoChanged, device: " + device.getAddress() + ", reason: " + reason + ", infoList: " + presetInfoList); } - mPresetCallback.onPresetInfoUpdated(getAllPresetInfo(), getActivePresetIndex()); + refreshPresetInfo(); } } @Override public void onPresetSelectionFailed(@NonNull BluetoothDevice device, int reason) { - if (mActiveHearingDevice == null) { + if (mDevice == null) { return; } - if (device.equals(mActiveHearingDevice.getDevice())) { + if (device.equals(mDevice.getDevice())) { Log.w(TAG, "onPresetSelectionFailed, device: " + device.getAddress() + ", reason: " + reason); - mPresetCallback.onPresetCommandFailed(reason); + if (mPresetCallback != null) { + mPresetCallback.onPresetCommandFailed(reason); + } } } @Override public void onPresetSelectionForGroupFailed(int hapGroupId, int reason) { - if (mActiveHearingDevice == null || mHapClientProfile == null) { + if (mDevice == null || mHapClientProfile == null) { return; } - if (hapGroupId == mHapClientProfile.getHapGroup(mActiveHearingDevice.getDevice())) { + if (hapGroupId == mHapClientProfile.getHapGroup(mDevice.getDevice())) { Log.w(TAG, "onPresetSelectionForGroupFailed, group: " + hapGroupId + ", reason: " + reason); selectPresetIndependently(mSelectedPresetIndex); @@ -125,33 +131,43 @@ public class HearingDevicesPresetsController implements @Override public void onSetPresetNameFailed(@NonNull BluetoothDevice device, int reason) { - if (mActiveHearingDevice == null) { + if (mDevice == null) { return; } - if (device.equals(mActiveHearingDevice.getDevice())) { + if (device.equals(mDevice.getDevice())) { Log.w(TAG, "onSetPresetNameFailed, device: " + device.getAddress() + ", reason: " + reason); - mPresetCallback.onPresetCommandFailed(reason); + if (mPresetCallback != null) { + mPresetCallback.onPresetCommandFailed(reason); + } } } @Override public void onSetPresetNameForGroupFailed(int hapGroupId, int reason) { - if (mActiveHearingDevice == null || mHapClientProfile == null) { + if (mDevice == null || mHapClientProfile == null) { return; } - if (hapGroupId == mHapClientProfile.getHapGroup(mActiveHearingDevice.getDevice())) { + if (hapGroupId == mHapClientProfile.getHapGroup(mDevice.getDevice())) { Log.w(TAG, "onSetPresetNameForGroupFailed, group: " + hapGroupId + ", reason: " + reason); } - mPresetCallback.onPresetCommandFailed(reason); + if (mPresetCallback != null) { + mPresetCallback.onPresetCommandFailed(reason); + } } /** - * Registers a callback to be notified about operation changed for {@link HapClientProfile}. + * Registers a callback to be notified about operation changed of {@link HapClientProfile}. */ public void registerHapCallback() { if (mHapClientProfile != null) { + if (!mHapClientProfile.isProfileReady()) { + mProfileManager.addServiceListener(this); + Log.w(TAG, "Profile is not ready yet, the callback will be registered once the " + + "profile is ready."); + return; + } try { mHapClientProfile.registerCallback(ThreadUtils.getBackgroundExecutor(), this); } catch (IllegalArgumentException e) { @@ -163,9 +179,10 @@ public class HearingDevicesPresetsController implements } /** - * Removes a previously-added {@link HapClientProfile} callback. + * Removes a previously-added {@link HapClientProfile} callback if exist. */ public void unregisterHapCallback() { + mProfileManager.removeServiceListener(this); if (mHapClientProfile != null) { try { mHapClientProfile.unregisterCallback(this); @@ -177,108 +194,137 @@ public class HearingDevicesPresetsController implements } /** - * Sets the hearing device for this controller to control the preset if it supports - * {@link HapClientProfile}. + * Sets the device for this controller to control the preset if it supports + * {@link HapClientProfile}, otherwise the device of this controller will be {@code null}. * - * @param activeHearingDevice the {@link CachedBluetoothDevice} need to be hearing aid device - * and support {@link HapClientProfile}. + * @param device the {@link CachedBluetoothDevice} set to the controller */ - public void setHearingDeviceIfSupportHap(CachedBluetoothDevice activeHearingDevice) { - if (mHapClientProfile == null || activeHearingDevice == null) { - mActiveHearingDevice = null; - return; - } - if (activeHearingDevice.getProfiles().stream().anyMatch( + public void setDevice(@Nullable CachedBluetoothDevice device) { + if (device != null && device.getProfiles().stream().anyMatch( profile -> profile instanceof HapClientProfile)) { - mActiveHearingDevice = activeHearingDevice; + mDevice = device; } else { - mActiveHearingDevice = null; + mDevice = null; } + refreshPresetInfo(); } /** - * Selects the currently active preset for {@code mActiveHearingDevice} individual device or - * the device group according to whether it supports synchronized presets or not. + * Refreshes the preset info of {@code mDevice}. If the preset info list or the active preset + * index is updated, the {@link PresetCallback#onPresetInfoUpdated(List, int)} will be called + * to notify the change. * - * @param presetIndex an index of one of the available presets + * <b>Note:</b> If {@code mDevice} is null, the cached preset info and active preset index will + * be reset to empty list and {@code BluetoothHapClient.PRESET_INDEX_UNAVAILABLE} respectively. */ - public void selectPreset(int presetIndex) { - if (mActiveHearingDevice == null || mHapClientProfile == null) { - return; + public void refreshPresetInfo() { + List<BluetoothHapPresetInfo> updatedInfos = new ArrayList<>(); + int updatedActiveIndex = BluetoothHapClient.PRESET_INDEX_UNAVAILABLE; + if (mHapClientProfile != null && mDevice != null) { + updatedInfos = mHapClientProfile.getAllPresetInfo(mDevice.getDevice()).stream().filter( + BluetoothHapPresetInfo::isAvailable).toList(); + updatedActiveIndex = mHapClientProfile.getActivePresetIndex(mDevice.getDevice()); } - mSelectedPresetIndex = presetIndex; - boolean supportSynchronizedPresets = mHapClientProfile.supportsSynchronizedPresets( - mActiveHearingDevice.getDevice()); - int hapGroupId = mHapClientProfile.getHapGroup(mActiveHearingDevice.getDevice()); - if (supportSynchronizedPresets) { - if (hapGroupId != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) { - selectPresetSynchronously(hapGroupId, presetIndex); - } else { - Log.w(TAG, "supportSynchronizedPresets but hapGroupId is invalid."); - selectPresetIndependently(presetIndex); + final boolean infoUpdated = !mPresetInfos.equals(updatedInfos); + final boolean activeIndexUpdated = mActivePresetIndex != updatedActiveIndex; + mPresetInfos = updatedInfos; + mActivePresetIndex = updatedActiveIndex; + if (infoUpdated || activeIndexUpdated) { + if (mPresetCallback != null) { + mPresetCallback.onPresetInfoUpdated(mPresetInfos, mActivePresetIndex); } - } else { - selectPresetIndependently(presetIndex); } } /** - * Gets all preset info for {@code mActiveHearingDevice} device. - * - * @return a list of all known preset info + * @return if the preset control is available. The preset control is available only + * when the {@code mDevice} supports HAP and the retrieved preset info list is not empty. + */ + public boolean isPresetControlAvailable() { + boolean deviceValid = mDevice != null && mDevice.isConnectedHapClientDevice(); + boolean hasPreset = mPresetInfos != null && !mPresetInfos.isEmpty(); + return deviceValid && hasPreset; + } + + /** + * @return a list of {@link BluetoothHapPresetInfo} retrieved from {@code mDevice} */ public List<BluetoothHapPresetInfo> getAllPresetInfo() { - if (mActiveHearingDevice == null || mHapClientProfile == null) { + if (mDevice == null || mHapClientProfile == null) { return emptyList(); } - return mHapClientProfile.getAllPresetInfo(mActiveHearingDevice.getDevice()).stream().filter( - BluetoothHapPresetInfo::isAvailable).toList(); + return mPresetInfos; } /** - * Gets the currently active preset for {@code mActiveHearingDevice} device. + * Gets the currently active preset of {@code mDevice}. * * @return active preset index */ public int getActivePresetIndex() { - if (mActiveHearingDevice == null || mHapClientProfile == null) { + if (mDevice == null || mHapClientProfile == null) { return BluetoothHapClient.PRESET_INDEX_UNAVAILABLE; } - return mHapClientProfile.getActivePresetIndex(mActiveHearingDevice.getDevice()); + return mActivePresetIndex; + } + + /** + * Selects the preset for {@code mDevice}. Performs individual or group operation according + * to whether the device supports synchronized presets feature or not. + * + * @param presetIndex an index of one of the available presets + */ + public void selectPreset(int presetIndex) { + if (mDevice == null || mHapClientProfile == null) { + return; + } + mSelectedPresetIndex = presetIndex; + boolean supportSynchronizedPresets = mHapClientProfile.supportsSynchronizedPresets( + mDevice.getDevice()); + int hapGroupId = mHapClientProfile.getHapGroup(mDevice.getDevice()); + if (supportSynchronizedPresets) { + if (hapGroupId != BluetoothCsipSetCoordinator.GROUP_ID_INVALID) { + selectPresetSynchronously(hapGroupId, presetIndex); + } else { + Log.w(TAG, "supportSynchronizedPresets but hapGroupId is invalid."); + selectPresetIndependently(presetIndex); + } + } else { + selectPresetIndependently(presetIndex); + } } private void selectPresetSynchronously(int groupId, int presetIndex) { - if (mActiveHearingDevice == null || mHapClientProfile == null) { + if (mDevice == null || mHapClientProfile == null) { return; } if (DEBUG) { Log.d(TAG, "selectPresetSynchronously" + ", presetIndex: " + presetIndex + ", groupId: " + groupId - + ", device: " + mActiveHearingDevice.getAddress()); + + ", device: " + mDevice.getAddress()); } mHapClientProfile.selectPresetForGroup(groupId, presetIndex); } private void selectPresetIndependently(int presetIndex) { - if (mActiveHearingDevice == null || mHapClientProfile == null) { + if (mDevice == null || mHapClientProfile == null) { return; } if (DEBUG) { Log.d(TAG, "selectPresetIndependently" + ", presetIndex: " + presetIndex - + ", device: " + mActiveHearingDevice.getAddress()); + + ", device: " + mDevice.getAddress()); } - mHapClientProfile.selectPreset(mActiveHearingDevice.getDevice(), presetIndex); - final CachedBluetoothDevice subDevice = mActiveHearingDevice.getSubDevice(); + mHapClientProfile.selectPreset(mDevice.getDevice(), presetIndex); + final CachedBluetoothDevice subDevice = mDevice.getSubDevice(); if (subDevice != null) { if (DEBUG) { Log.d(TAG, "selectPreset for subDevice, device: " + subDevice); } mHapClientProfile.selectPreset(subDevice.getDevice(), presetIndex); } - for (final CachedBluetoothDevice memberDevice : - mActiveHearingDevice.getMemberDevice()) { + for (final CachedBluetoothDevice memberDevice : mDevice.getMemberDevice()) { if (DEBUG) { Log.d(TAG, "selectPreset for memberDevice, device: " + memberDevice); } @@ -294,9 +340,8 @@ public class HearingDevicesPresetsController implements /** * Called when preset info from {@link HapClientProfile} operation get updated. * - * @param presetInfos all preset info for {@code mActiveHearingDevice} device - * @param activePresetIndex currently active preset index for {@code mActiveHearingDevice} - * device + * @param presetInfos all preset info of {@code mDevice} + * @param activePresetIndex currently active preset index of {@code mDevice} */ void onPresetInfoUpdated(List<BluetoothHapPresetInfo> presetInfos, int activePresetIndex); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java index f6b6655dca4d..b6537118324e 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java @@ -27,7 +27,6 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.AlertDialog; -import android.app.KeyguardManager; import android.content.Context; import android.content.res.Configuration; import android.graphics.PixelFormat; @@ -320,16 +319,6 @@ public class AuthContainerView extends LinearLayout mBiometricCallback = new BiometricCallback(); mMSDLPlayer = msdlPlayer; - // Listener for when device locks from adaptive auth, dismiss prompt - getContext().getSystemService(KeyguardManager.class).addKeyguardLockedStateListener( - getContext().getMainExecutor(), - isKeyguardLocked -> { - if (isKeyguardLocked) { - onStartedGoingToSleep(); - } - } - ); - final BiometricModalities biometricModalities = new BiometricModalities( Utils.findFirstSensorProperties(fpProps, mConfig.mSensorIds), Utils.findFirstSensorProperties(faceProps, mConfig.mSensorIds)); diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java index 4faf6ff9f596..316849d90cf3 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java @@ -27,6 +27,7 @@ import static com.android.systemui.util.ConvenienceExtensionsKt.toKotlinLazy; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityTaskManager; +import android.app.KeyguardManager; import android.app.TaskStackListener; import android.content.BroadcastReceiver; import android.content.Context; @@ -737,6 +738,7 @@ public class AuthController implements @Background DelayableExecutor bgExecutor, @NonNull UdfpsUtils udfpsUtils, @NonNull VibratorHelper vibratorHelper, + @NonNull KeyguardManager keyguardManager, Lazy<ViewCapture> daggerLazyViewCapture, @NonNull MSDLPlayer msdlPlayer) { mContext = context; @@ -768,6 +770,15 @@ public class AuthController implements mPromptViewModelProvider = promptViewModelProvider; mCredentialViewModelProvider = credentialViewModelProvider; + keyguardManager.addKeyguardLockedStateListener( + context.getMainExecutor(), + isKeyguardLocked -> { + if (isKeyguardLocked) { + closeDialog("Device lock"); + } + } + ); + mOrientationListener = new BiometricDisplayListener( context, mDisplayManager, diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/EmergencyServicesRepository.kt b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/EmergencyServicesRepository.kt index bba00506df85..a42ae03b2c4e 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/EmergencyServicesRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/data/repository/EmergencyServicesRepository.kt @@ -18,6 +18,7 @@ package com.android.systemui.bouncer.data.repository import android.content.res.Resources import com.android.internal.R +import com.android.systemui.common.ui.GlobalConfig import com.android.systemui.common.ui.data.repository.ConfigurationRepository import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application @@ -36,7 +37,7 @@ class EmergencyServicesRepository constructor( @Application private val applicationScope: CoroutineScope, @Main private val resources: Resources, - configurationRepository: ConfigurationRepository, + @GlobalConfig configurationRepository: ConfigurationRepository, ) { /** * Whether to enable emergency services calls while the SIM card is locked. This is disabled in diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractor.kt index 61cd7c7049f4..641400a50c89 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/PrimaryBouncerInteractor.kt @@ -42,6 +42,7 @@ import com.android.systemui.keyguard.data.repository.TrustRepository import com.android.systemui.plugins.ActivityStarter import com.android.systemui.res.R import com.android.systemui.scene.shared.flag.SceneContainerFlag +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shared.system.SysUiStatsLog import com.android.systemui.statusbar.policy.KeyguardStateController import com.android.systemui.user.domain.interactor.SelectedUserInteractor @@ -71,7 +72,7 @@ constructor( private val primaryBouncerCallbackInteractor: PrimaryBouncerCallbackInteractor, private val falsingCollector: FalsingCollector, private val dismissCallbackRegistry: DismissCallbackRegistry, - private val context: Context, + @ShadeDisplayAware private val context: Context, private val keyguardUpdateMonitor: KeyguardUpdateMonitor, private val trustRepository: TrustRepository, @Application private val applicationScope: CoroutineScope, diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractor.kt b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractor.kt index 1aaf4fb9f296..ec9ee916b285 100644 --- a/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/bouncer/domain/interactor/SimBouncerInteractor.kt @@ -37,6 +37,7 @@ import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionsRepository import com.android.systemui.util.icuMessageFormat import javax.inject.Inject @@ -62,7 +63,7 @@ constructor( @Background private val backgroundDispatcher: CoroutineDispatcher, private val repository: SimBouncerRepository, private val telephonyManager: TelephonyManager, - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val keyguardUpdateMonitor: KeyguardUpdateMonitor, private val euiccManager: EuiccManager?, // TODO(b/307977401): Replace this with `MobileConnectionsInteractor` when available. diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/backup/CommunalBackupUtils.kt b/packages/SystemUI/src/com/android/systemui/communal/data/backup/CommunalBackupUtils.kt index c3d2683ce953..41ea7b6c2202 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/backup/CommunalBackupUtils.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/backup/CommunalBackupUtils.kt @@ -29,9 +29,7 @@ import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking /** Utilities for communal backup and restore. */ -class CommunalBackupUtils( - private val context: Context, -) { +class CommunalBackupUtils(private val context: Context) { /** * Retrieves a communal hub state protobuf that represents the current state of the communal @@ -50,6 +48,8 @@ class CommunalBackupUtils( widgetId = widget.widgetId componentName = widget.componentName userSerialNumber = widget.userSerialNumber + spanY = widget.spanY + spanYNew = widget.spanYNew } ) } diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalDatabase.kt b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalDatabase.kt index e72088f37fa7..679d0714b1b4 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalDatabase.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalDatabase.kt @@ -26,9 +26,11 @@ import androidx.room.RoomDatabase import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase import com.android.systemui.communal.shared.model.GlanceableHubMultiUserHelperImpl +import com.android.systemui.communal.shared.model.SpanValue +import com.android.systemui.communal.shared.model.toResponsive import com.android.systemui.res.R -@Database(entities = [CommunalWidgetItem::class, CommunalItemRank::class], version = 4) +@Database(entities = [CommunalWidgetItem::class, CommunalItemRank::class], version = 5) abstract class CommunalDatabase : RoomDatabase() { abstract fun communalWidgetDao(): CommunalWidgetDao @@ -59,7 +61,12 @@ abstract class CommunalDatabase : RoomDatabase() { context.resources.getString(R.string.config_communalDatabase), ) .also { builder -> - builder.addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4) + builder.addMigrations( + MIGRATION_1_2, + MIGRATION_2_3, + MIGRATION_3_4, + MIGRATION_4_5, + ) builder.fallbackToDestructiveMigration(dropAllTables = true) callback?.let { callback -> builder.addCallback(callback) } } @@ -123,5 +130,30 @@ abstract class CommunalDatabase : RoomDatabase() { ) } } + + /** This migration adds a new spanY column for responsive grid sizing. */ + @VisibleForTesting + val MIGRATION_4_5 = + object : Migration(4, 5) { + override fun migrate(db: SupportSQLiteDatabase) { + Log.i(TAG, "Migrating from version 4 to 5") + db.execSQL( + "ALTER TABLE communal_widget_table " + + "ADD COLUMN span_y_new INTEGER NOT NULL DEFAULT 1" + ) + db.query("SELECT item_id, span_y FROM communal_widget_table").use { cursor -> + while (cursor.moveToNext()) { + val id = cursor.getInt(cursor.getColumnIndex("item_id")) + val spanYFixed = + SpanValue.Fixed(cursor.getInt(cursor.getColumnIndex("span_y"))) + val spanYResponsive = spanYFixed.toResponsive() + db.execSQL( + "UPDATE communal_widget_table SET span_y_new = " + + "${spanYResponsive.value} WHERE item_id = $id" + ) + } + } + } + } } } diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalEntities.kt b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalEntities.kt index f9d2a843c213..6ef4bb8e55eb 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalEntities.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalEntities.kt @@ -45,7 +45,12 @@ data class CommunalWidgetItem( * The vertical span of the widget. Span_Y default value corresponds to * CommunalContentSize.HALF.span */ - @ColumnInfo(name = "span_y", defaultValue = "3") val spanY: Int, + @Deprecated("Use spanYNew instead") + @ColumnInfo(name = "span_y", defaultValue = "3") + val spanY: Int, + + /** The vertical span of the widget in grid cell units. */ + @ColumnInfo(name = "span_y_new", defaultValue = "1") val spanYNew: Int, ) { companion object { /** diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalWidgetDao.kt b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalWidgetDao.kt index 3d40aa75b488..3907a37cd5d9 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalWidgetDao.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/db/CommunalWidgetDao.kt @@ -27,7 +27,9 @@ import androidx.room.Update import androidx.sqlite.db.SupportSQLiteDatabase import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.communal.nano.CommunalHubState -import com.android.systemui.communal.shared.model.CommunalContentSize +import com.android.systemui.communal.shared.model.SpanValue +import com.android.systemui.communal.shared.model.toFixed +import com.android.systemui.communal.shared.model.toResponsive import com.android.systemui.communal.widgets.CommunalWidgetHost import com.android.systemui.communal.widgets.CommunalWidgetModule.Companion.DEFAULT_WIDGETS import com.android.systemui.dagger.SysUISingleton @@ -101,6 +103,7 @@ constructor( componentName = name, rank = index, userSerialNumber = userSerialNumber, + spanY = SpanValue.Fixed(3), ) } } @@ -155,15 +158,16 @@ interface CommunalWidgetDao { @Query( "INSERT INTO communal_widget_table" + - "(widget_id, component_name, item_id, user_serial_number, span_y) " + - "VALUES(:widgetId, :componentName, :itemId, :userSerialNumber, :spanY)" + "(widget_id, component_name, item_id, user_serial_number, span_y, span_y_new) " + + "VALUES(:widgetId, :componentName, :itemId, :userSerialNumber, :spanY, :spanYNew)" ) fun insertWidget( widgetId: Int, componentName: String, itemId: Long, userSerialNumber: Int, - spanY: Int = 3, + spanY: Int, + spanYNew: Int, ): Long @Query("INSERT INTO communal_item_rank_table(rank) VALUES(:rank)") @@ -189,10 +193,12 @@ interface CommunalWidgetDao { } @Transaction - fun resizeWidget(appWidgetId: Int, spanY: Int, widgetIdToRankMap: Map<Int, Int>) { + fun resizeWidget(appWidgetId: Int, spanY: SpanValue, widgetIdToRankMap: Map<Int, Int>) { val widget = getWidgetByIdNow(appWidgetId) if (widget != null) { - updateWidget(widget.copy(spanY = spanY)) + updateWidget( + widget.copy(spanY = spanY.toFixed().value, spanYNew = spanY.toResponsive().value) + ) } updateWidgetOrder(widgetIdToRankMap) } @@ -203,7 +209,7 @@ interface CommunalWidgetDao { provider: ComponentName, rank: Int? = null, userSerialNumber: Int, - spanY: Int = CommunalContentSize.HALF.span, + spanY: SpanValue, ): Long { return addWidget( widgetId = widgetId, @@ -220,7 +226,7 @@ interface CommunalWidgetDao { componentName: String, rank: Int? = null, userSerialNumber: Int, - spanY: Int = 3, + spanY: SpanValue, ): Long { val widgets = getWidgetsNow() @@ -241,7 +247,8 @@ interface CommunalWidgetDao { componentName = componentName, itemId = insertItemRank(newRank), userSerialNumber = userSerialNumber, - spanY = spanY, + spanY = spanY.toFixed().value, + spanYNew = spanY.toResponsive().value, ) } @@ -264,7 +271,11 @@ interface CommunalWidgetDao { clearCommunalItemRankTable() state.widgets.forEach { - val spanY = if (it.spanY != 0) it.spanY else CommunalContentSize.HALF.span + // Check if there is a new value to restore. If so, restore that new value. + val spanYResponsive = if (it.spanYNew != 0) SpanValue.Responsive(it.spanYNew) else null + // If no new value, restore any existing old values. + val spanY = spanYResponsive ?: SpanValue.Fixed(it.spanY.coerceIn(3, 6)) + addWidget(it.widgetId, it.componentName, it.rank, it.userSerialNumber, spanY) } } diff --git a/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalWidgetRepository.kt b/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalWidgetRepository.kt index 29569f8b7df5..e44d78baeb35 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalWidgetRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/data/repository/CommunalWidgetRepository.kt @@ -22,6 +22,7 @@ import android.content.ComponentName import android.os.UserHandle import android.os.UserManager import com.android.app.tracing.coroutines.launchTraced as launch +import com.android.systemui.Flags.communalResponsiveGrid import com.android.systemui.Flags.communalWidgetResizing import com.android.systemui.common.data.repository.PackageChangeRepository import com.android.systemui.common.shared.model.PackageInstallSession @@ -33,6 +34,7 @@ import com.android.systemui.communal.data.db.DefaultWidgetPopulation.SkipReason. import com.android.systemui.communal.nano.CommunalHubState import com.android.systemui.communal.proto.toCommunalHubState import com.android.systemui.communal.shared.model.CommunalWidgetContentModel +import com.android.systemui.communal.shared.model.SpanValue import com.android.systemui.communal.widgets.CommunalAppWidgetHost import com.android.systemui.communal.widgets.CommunalWidgetHost import com.android.systemui.communal.widgets.WidgetConfigurator @@ -143,15 +145,21 @@ constructor( componentName = widget.componentName, rank = rank.rank, providerInfo = providers[widget.widgetId], - spanY = widget.spanY, + spanY = if (communalResponsiveGrid()) widget.spanYNew else widget.spanY, ) } } override fun resizeWidget(appWidgetId: Int, spanY: Int, widgetIdToRankMap: Map<Int, Int>) { if (!communalWidgetResizing()) return + val spanValue = + if (communalResponsiveGrid()) { + SpanValue.Responsive(spanY) + } else { + SpanValue.Fixed(spanY) + } bgScope.launch { - communalWidgetDao.resizeWidget(appWidgetId, spanY, widgetIdToRankMap) + communalWidgetDao.resizeWidget(appWidgetId, spanValue, widgetIdToRankMap) logger.i({ "Updated spanY of widget $int1 to $int2." }) { int1 = appWidgetId int2 = spanY @@ -225,7 +233,7 @@ constructor( provider = provider, rank = rank, userSerialNumber = userManager.getUserSerialNumber(user.identifier), - spanY = 3, + spanY = SpanValue.Fixed(3), ) backupManager.dataChanged() } else { diff --git a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt index 602fe307a1fe..f9b30c6c2ba1 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt @@ -34,9 +34,9 @@ import com.android.systemui.communal.data.repository.CommunalWidgetRepository import com.android.systemui.communal.domain.model.CommunalContentModel import com.android.systemui.communal.domain.model.CommunalContentModel.WidgetContent import com.android.systemui.communal.shared.model.CommunalContentSize -import com.android.systemui.communal.shared.model.CommunalContentSize.FULL -import com.android.systemui.communal.shared.model.CommunalContentSize.HALF -import com.android.systemui.communal.shared.model.CommunalContentSize.THIRD +import com.android.systemui.communal.shared.model.CommunalContentSize.FixedSize.FULL +import com.android.systemui.communal.shared.model.CommunalContentSize.FixedSize.HALF +import com.android.systemui.communal.shared.model.CommunalContentSize.FixedSize.THIRD import com.android.systemui.communal.shared.model.CommunalScenes import com.android.systemui.communal.shared.model.CommunalWidgetContentModel import com.android.systemui.communal.shared.model.EditModeState diff --git a/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt b/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt index 30f580e472e8..da613f58dce8 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/domain/model/CommunalContentModel.kt @@ -22,6 +22,7 @@ import android.content.ComponentName import android.content.pm.ApplicationInfo import android.graphics.Bitmap import android.widget.RemoteViews +import com.android.systemui.Flags.communalResponsiveGrid import com.android.systemui.communal.shared.model.CommunalContentSize import java.util.UUID @@ -35,7 +36,7 @@ sealed interface CommunalContentModel { /** The minimum size content can be resized to. */ val minSize: CommunalContentSize - get() = CommunalContentSize.HALF + get() = fixedHalfOrResponsiveSize() /** * A type of communal content is ongoing / live / ephemeral, and can be sized and ordered @@ -44,7 +45,12 @@ sealed interface CommunalContentModel { sealed interface Ongoing : CommunalContentModel { override var size: CommunalContentSize override val minSize - get() = CommunalContentSize.THIRD + get() = + if (communalResponsiveGrid()) { + CommunalContentSize.Responsive(1) + } else { + CommunalContentSize.FixedSize.THIRD + } /** Timestamp in milliseconds of when the content was created. */ val createdTimestampMillis: Long @@ -100,14 +106,16 @@ sealed interface CommunalContentModel { class WidgetPlaceholder : CommunalContentModel { override val key: String = KEY.widgetPlaceholder() // Same as widget size. - override val size = CommunalContentSize.HALF + override val size: CommunalContentSize + get() = fixedHalfOrResponsiveSize() } /** A CTA tile in the glanceable hub view mode which can be dismissed. */ class CtaTileInViewMode : CommunalContentModel { override val key: String = KEY.CTA_TILE_IN_VIEW_MODE_KEY // Same as widget size. - override val size = CommunalContentSize.HALF + override val size: CommunalContentSize + get() = fixedHalfOrResponsiveSize() } class Tutorial(id: Int, override var size: CommunalContentSize) : CommunalContentModel { @@ -118,15 +126,15 @@ sealed interface CommunalContentModel { smartspaceTargetId: String, val remoteViews: RemoteViews, override val createdTimestampMillis: Long, - override var size: CommunalContentSize = CommunalContentSize.HALF, + override var size: CommunalContentSize = fixedHalfOrResponsiveSize(), ) : Ongoing { override val key = KEY.smartspace(smartspaceTargetId) } class Umo( override val createdTimestampMillis: Long, - override var size: CommunalContentSize = CommunalContentSize.HALF, - override var minSize: CommunalContentSize = CommunalContentSize.HALF, + override var size: CommunalContentSize = fixedHalfOrResponsiveSize(), + override var minSize: CommunalContentSize = fixedHalfOrResponsiveSize(), ) : Ongoing { override val key = KEY.umo() } @@ -170,3 +178,10 @@ sealed interface CommunalContentModel { fun isLiveContent() = this is Smartspace || this is Umo } + +private fun fixedHalfOrResponsiveSize() = + if (communalResponsiveGrid()) { + CommunalContentSize.Responsive(1) + } else { + CommunalContentSize.FixedSize.HALF + } diff --git a/packages/SystemUI/src/com/android/systemui/communal/proto/communal_hub_state.proto b/packages/SystemUI/src/com/android/systemui/communal/proto/communal_hub_state.proto index 7602a7afce4e..04717d0c864b 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/proto/communal_hub_state.proto +++ b/packages/SystemUI/src/com/android/systemui/communal/proto/communal_hub_state.proto @@ -39,7 +39,10 @@ message CommunalHubState { // Serial number of the user associated with the widget. int32 user_serial_number = 4; - // The vertical span of the widget + // The vertical span of the widget, replaced by span_y_new. int32 span_y = 5; + + // The vertical span of the widget. + int32 span_y_new = 6; } } diff --git a/packages/SystemUI/src/com/android/systemui/communal/shared/model/CommunalContentSize.kt b/packages/SystemUI/src/com/android/systemui/communal/shared/model/CommunalContentSize.kt index cf80b7d62fd5..df30716ebaf2 100644 --- a/packages/SystemUI/src/com/android/systemui/communal/shared/model/CommunalContentSize.kt +++ b/packages/SystemUI/src/com/android/systemui/communal/shared/model/CommunalContentSize.kt @@ -16,27 +16,39 @@ package com.android.systemui.communal.shared.model +import com.android.systemui.Flags.communalResponsiveGrid + /** * Supported sizes for communal content in the layout grid. * - * @param span The span of the content in a column. For example, if FULL is 6, then 3 represents - * HALF, 2 represents THIRD, and 1 represents SIXTH. + * @property span The span of the content in a column. */ -enum class CommunalContentSize(val span: Int) { - /** Content takes the full height of the column. */ - FULL(6), +sealed interface CommunalContentSize { + val span: Int + + @Deprecated("Use Responsive size instead") + enum class FixedSize(override val span: Int) : CommunalContentSize { + /** Content takes the full height of the column. */ + FULL(6), - /** Content takes half of the height of the column. */ - HALF(3), + /** Content takes half of the height of the column. */ + HALF(3), + + /** Content takes a third of the height of the column. */ + THIRD(2), + } - /** Content takes a third of the height of the column. */ - THIRD(2); + @JvmInline value class Responsive(override val span: Int) : CommunalContentSize companion object { /** Converts from span to communal content size. */ fun toSize(span: Int): CommunalContentSize { - return entries.find { it.span == span } - ?: throw IllegalArgumentException("$span is not a valid span size") + return if (communalResponsiveGrid()) { + Responsive(span) + } else { + FixedSize.entries.find { it.span == span } + ?: throw IllegalArgumentException("$span is not a valid span size") + } } } } diff --git a/packages/SystemUI/src/com/android/systemui/communal/shared/model/SpanValue.kt b/packages/SystemUI/src/com/android/systemui/communal/shared/model/SpanValue.kt new file mode 100644 index 000000000000..15cc6b0ad2c8 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/communal/shared/model/SpanValue.kt @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.communal.shared.model + +/** Models possible span values for different grid formats. */ +sealed interface SpanValue { + val value: Int + + @Deprecated("Use Responsive sizes instead") + @JvmInline + value class Fixed(override val value: Int) : SpanValue + + @JvmInline value class Responsive(override val value: Int) : SpanValue +} + +fun SpanValue.toResponsive(): SpanValue.Responsive = + when (this) { + is SpanValue.Responsive -> this + is SpanValue.Fixed -> SpanValue.Responsive((this.value / 3).coerceAtMost(1)) + } + +fun SpanValue.toFixed(): SpanValue.Fixed = + when (this) { + is SpanValue.Fixed -> this + is SpanValue.Responsive -> SpanValue.Fixed((this.value * 3).coerceIn(3, 6)) + } diff --git a/packages/SystemUI/src/com/android/systemui/education/ui/view/ContextualEduUiCoordinator.kt b/packages/SystemUI/src/com/android/systemui/education/ui/view/ContextualEduUiCoordinator.kt index c49ba80c660b..a36e45f43bef 100644 --- a/packages/SystemUI/src/com/android/systemui/education/ui/view/ContextualEduUiCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/education/ui/view/ContextualEduUiCoordinator.kt @@ -29,6 +29,11 @@ import android.view.accessibility.AccessibilityManager import androidx.core.app.NotificationCompat import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.CoreStartable +import com.android.systemui.contextualeducation.GestureType +import com.android.systemui.contextualeducation.GestureType.ALL_APPS +import com.android.systemui.contextualeducation.GestureType.BACK +import com.android.systemui.contextualeducation.GestureType.HOME +import com.android.systemui.contextualeducation.GestureType.OVERVIEW import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.education.ui.viewmodel.ContextualEduNotificationViewModel @@ -37,6 +42,10 @@ import com.android.systemui.education.ui.viewmodel.ContextualEduViewModel import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity.Companion.INTENT_TUTORIAL_ENTRY_POINT_CONTEXTUAL_EDU import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity.Companion.INTENT_TUTORIAL_ENTRY_POINT_KEY +import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity.Companion.INTENT_TUTORIAL_SCOPE_KEY +import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity.Companion.INTENT_TUTORIAL_SCOPE_KEYBOARD +import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity.Companion.INTENT_TUTORIAL_SCOPE_TOUCHPAD_BACK +import com.android.systemui.inputdevice.tutorial.ui.view.KeyboardTouchpadTutorialActivity.Companion.INTENT_TUTORIAL_SCOPE_TOUCHPAD_HOME import com.android.systemui.res.R import javax.inject.Inject import kotlinx.coroutines.CoroutineScope @@ -59,6 +68,8 @@ constructor( private const val CHANNEL_ID = "ContextualEduNotificationChannel" private const val TAG = "ContextualEduUiCoordinator" private const val NOTIFICATION_ID = 1000 + private const val TUTORIAL_ACTION: String = "com.android.systemui.action.TOUCHPAD_TUTORIAL" + private const val SYSTEMUI_PACKAGE_NAME: String = "com.android.systemui" } @Inject @@ -125,7 +136,7 @@ constructor( .setSmallIcon(R.drawable.ic_settings) .setContentTitle(model.title) .setContentText(model.message) - .setContentIntent(createPendingIntent()) + .setContentIntent(createPendingIntent(model.gestureType)) .setPriority(NotificationCompat.PRIORITY_DEFAULT) .setAutoCancel(true) .addExtras(extras) @@ -138,21 +149,37 @@ constructor( ) } - private fun createPendingIntent(): PendingIntent { + private fun createPendingIntent(gestureType: GestureType): PendingIntent { val intent = - Intent(context, KeyboardTouchpadTutorialActivity::class.java).apply { - addCategory(Intent.CATEGORY_DEFAULT) - flags = Intent.FLAG_ACTIVITY_NEW_TASK - putExtra( - INTENT_TUTORIAL_ENTRY_POINT_KEY, - INTENT_TUTORIAL_ENTRY_POINT_CONTEXTUAL_EDU, - ) + when (gestureType) { + BACK -> createKeyboardTouchpadTutorialIntent(INTENT_TUTORIAL_SCOPE_TOUCHPAD_BACK) + HOME -> createKeyboardTouchpadTutorialIntent(INTENT_TUTORIAL_SCOPE_TOUCHPAD_HOME) + ALL_APPS -> createKeyboardTouchpadTutorialIntent(INTENT_TUTORIAL_SCOPE_KEYBOARD) + OVERVIEW -> createTouchpadTutorialIntent() } + return PendingIntent.getActivity( context, /* requestCode= */ 0, intent, - PendingIntent.FLAG_IMMUTABLE, + // FLAG_UPDATE_CURRENT to avoid caching of intent extras and always use latest values + PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT, ) } + + private fun createKeyboardTouchpadTutorialIntent(tutorialType: String): Intent { + return Intent(context, KeyboardTouchpadTutorialActivity::class.java).apply { + addCategory(Intent.CATEGORY_DEFAULT) + flags = Intent.FLAG_ACTIVITY_NEW_TASK + putExtra(INTENT_TUTORIAL_SCOPE_KEY, tutorialType) + putExtra(INTENT_TUTORIAL_ENTRY_POINT_KEY, INTENT_TUTORIAL_ENTRY_POINT_CONTEXTUAL_EDU) + } + } + + private fun createTouchpadTutorialIntent(): Intent { + return Intent(TUTORIAL_ACTION).apply { + flags = Intent.FLAG_ACTIVITY_NEW_TASK + setPackage(SYSTEMUI_PACKAGE_NAME) + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/education/ui/viewmodel/ContextualEduContentViewModel.kt b/packages/SystemUI/src/com/android/systemui/education/ui/viewmodel/ContextualEduContentViewModel.kt index 5a02cda8c3f5..06c0d6c88f7b 100644 --- a/packages/SystemUI/src/com/android/systemui/education/ui/viewmodel/ContextualEduContentViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/education/ui/viewmodel/ContextualEduContentViewModel.kt @@ -16,11 +16,14 @@ package com.android.systemui.education.ui.viewmodel +import com.android.systemui.contextualeducation.GestureType + sealed class ContextualEduContentViewModel(open val userId: Int) data class ContextualEduNotificationViewModel( val title: String, val message: String, + val gestureType: GestureType, override val userId: Int, ) : ContextualEduContentViewModel(userId) diff --git a/packages/SystemUI/src/com/android/systemui/education/ui/viewmodel/ContextualEduViewModel.kt b/packages/SystemUI/src/com/android/systemui/education/ui/viewmodel/ContextualEduViewModel.kt index 7417a7098ea3..443ad020a570 100644 --- a/packages/SystemUI/src/com/android/systemui/education/ui/viewmodel/ContextualEduViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/education/ui/viewmodel/ContextualEduViewModel.kt @@ -68,6 +68,7 @@ constructor( ContextualEduNotificationViewModel( getEduTitle(it), getEduContent(it), + it.gestureType, it.userId, ) } else { diff --git a/packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/ActionTutorialContent.kt b/packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/ActionTutorialContent.kt index 1b044de5cf63..0c1bc835517a 100644 --- a/packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/ActionTutorialContent.kt +++ b/packages/SystemUI/src/com/android/systemui/inputdevice/tutorial/ui/composable/ActionTutorialContent.kt @@ -20,6 +20,7 @@ import android.content.res.Configuration import androidx.annotation.RawRes import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.background +import androidx.compose.foundation.focusable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -33,8 +34,12 @@ import androidx.compose.foundation.layout.width import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.platform.LocalConfiguration @@ -125,6 +130,8 @@ fun TutorialDescription( config: TutorialScreenConfig, modifier: Modifier = Modifier, ) { + val focusRequester = remember { FocusRequester() } + LaunchedEffect(Unit) { focusRequester.requestFocus() } val (titleTextId, bodyTextId) = if (actionState is Finished) { config.strings.titleSuccessResId to config.strings.bodySuccessResId @@ -136,6 +143,7 @@ fun TutorialDescription( text = stringResource(id = titleTextId), style = MaterialTheme.typography.displayLarge, color = config.colors.title, + modifier = Modifier.focusRequester(focusRequester).focusable(), ) Spacer(modifier = Modifier.height(16.dp)) Text( diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt index 38fc2a80ad02..84a423e226b4 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/docking/ui/viewmodel/KeyboardDockingIndicationViewModel.kt @@ -21,11 +21,12 @@ import android.view.Surface import android.view.WindowManager import com.android.app.tracing.coroutines.launchTraced as launch import com.android.settingslib.Utils +import com.android.systemui.common.ui.GlobalConfig import com.android.systemui.common.ui.domain.interactor.ConfigurationInteractor import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.keyboard.docking.domain.interactor.KeyboardDockingIndicationInteractor -import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.surfaceeffects.glowboxeffect.GlowBoxConfig import javax.inject.Inject import kotlinx.coroutines.CoroutineScope @@ -37,9 +38,9 @@ class KeyboardDockingIndicationViewModel @Inject constructor( private val windowManager: WindowManager, - private val context: Context, + @Application private val context: Context, keyboardDockingIndicationInteractor: KeyboardDockingIndicationInteractor, - @ShadeDisplayAware configurationInteractor: ConfigurationInteractor, + @GlobalConfig configurationInteractor: ConfigurationInteractor, @Background private val backgroundScope: CoroutineScope, ) { diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutCategoriesUtils.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutCategoriesUtils.kt index 27d1a30f4346..4a725ec8abad 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutCategoriesUtils.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/repository/ShortcutCategoriesUtils.kt @@ -33,6 +33,7 @@ import com.android.systemui.keyboard.shortcut.shared.model.Shortcut import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategory import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategoryType import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCommand +import com.android.systemui.keyboard.shortcut.shared.model.ShortcutHelperExclusions import com.android.systemui.keyboard.shortcut.shared.model.ShortcutIcon import com.android.systemui.keyboard.shortcut.shared.model.ShortcutKey import com.android.systemui.keyboard.shortcut.shared.model.ShortcutSubCategory @@ -46,6 +47,7 @@ constructor( private val context: Context, @Background private val backgroundCoroutineContext: CoroutineContext, private val inputManager: InputManager, + private val shortcutHelperExclusions: ShortcutHelperExclusions, ) { fun removeUnsupportedModifiers(modifierMask: Int): Int { @@ -135,6 +137,8 @@ constructor( label = shortcutInfo.label, icon = toShortcutIcon(keepIcon, shortcutInfo), commands = listOf(shortcutCommand), + isCustomizable = + shortcutHelperExclusions.isShortcutCustomizable(shortcutInfo.label), ) } diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt index 687ad9550b16..5060abdda247 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/data/source/SystemShortcutsSource.kt @@ -54,7 +54,7 @@ constructor(@Main private val resources: Resources, private val inputManager: In listOf( KeyboardShortcutGroup( resources.getString(R.string.shortcut_helper_category_system_controls), - hardwareShortcuts(deviceId) + systemControlsShortcuts(), + systemControlsShortcuts() + hardwareShortcuts(deviceId), ), KeyboardShortcutGroup( resources.getString(R.string.shortcut_helper_category_system_apps), diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractor.kt index 2385cc6a4c47..61d11f4df5e0 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractor.kt @@ -92,10 +92,8 @@ constructor( .groupBy { it.label } .entries .map { (commonLabel, groupedShortcuts) -> - Shortcut( - label = commonLabel, - icon = groupedShortcuts.firstOrNull()?.icon, - commands = groupedShortcuts.flatMap { it.commands }, + groupedShortcuts[0].copy( + commands = groupedShortcuts.flatMap { it.commands }.sortedBy { it.keys.size }, contentDescription = toContentDescription(commonLabel, groupedShortcuts.flatMap { it.commands }), ) diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/Shortcut.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/Shortcut.kt index 9cc15ce809e9..55cc8e0905b6 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/Shortcut.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/Shortcut.kt @@ -21,6 +21,7 @@ data class Shortcut( val commands: List<ShortcutCommand>, val icon: ShortcutIcon? = null, val contentDescription: String = "", + val isCustomizable: Boolean = true, ) { val containsCustomShortcutCommands: Boolean = commands.any { it.isCustom } } @@ -28,6 +29,7 @@ data class Shortcut( class ShortcutBuilder(private val label: String) { val commands = mutableListOf<ShortcutCommand>() var contentDescription = "" + var isCustomizable = true fun command(builder: ShortcutCommandBuilder.() -> Unit) { commands += ShortcutCommandBuilder().apply(builder).build() @@ -37,7 +39,13 @@ class ShortcutBuilder(private val label: String) { contentDescription = string.invoke() } - fun build() = Shortcut(label, commands, contentDescription = contentDescription) + fun build() = + Shortcut( + label, + commands, + contentDescription = contentDescription, + isCustomizable = isCustomizable, + ) } fun shortcut(label: String, block: ShortcutBuilder.() -> Unit): Shortcut = diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/ShortcutHelperExclusions.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/ShortcutHelperExclusions.kt new file mode 100644 index 000000000000..20b74c86973f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/ShortcutHelperExclusions.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyboard.shortcut.shared.model + +import android.content.Context +import com.android.systemui.res.R +import javax.inject.Inject + +class ShortcutHelperExclusions @Inject constructor(private val context: Context) { + private val nonCustomizableShortcutsLabels: List<String> + get() = + listOf( + context.getString(R.string.group_system_cycle_forward), + context.getString(R.string.group_system_cycle_back), + ) + + fun isShortcutCustomizable(label: String) = !nonCustomizableShortcutsLabels.contains(label) +} diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/ShortcutSubCategory.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/ShortcutSubCategory.kt index 14016783a478..37433ca4faf3 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/ShortcutSubCategory.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/shared/model/ShortcutSubCategory.kt @@ -16,7 +16,9 @@ package com.android.systemui.keyboard.shortcut.shared.model -data class ShortcutSubCategory(val label: String, val shortcuts: List<Shortcut>) +data class ShortcutSubCategory(val label: String, val shortcuts: List<Shortcut>) { + val containsCustomShortcuts: Boolean = shortcuts.any { it.containsCustomShortcutCommands } +} class ShortcutSubCategoryBuilder(val label: String) { private val shortcuts = mutableListOf<Shortcut>() diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/ShortcutCustomizationDialogStarter.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/ShortcutCustomizationDialogStarter.kt index bd0430bf96c3..274fa59045d7 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/ShortcutCustomizationDialogStarter.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/ShortcutCustomizationDialogStarter.kt @@ -53,15 +53,18 @@ constructor( override suspend fun onActivated(): Nothing { viewModel.shortcutCustomizationUiState.collect { uiState -> - val shouldShowAddDialog = uiState is AddShortcutDialog && !uiState.isDialogShowing - val shouldShowDeleteDialog = uiState is DeleteShortcutDialog && !uiState.isDialogShowing - val shouldShowResetDialog = uiState is ResetShortcutDialog && !uiState.isDialogShowing - if (shouldShowDeleteDialog || shouldShowAddDialog || shouldShowResetDialog) { - dialog = createDialog().also { it.show() } - viewModel.onDialogShown() - } else if (uiState is ShortcutCustomizationUiState.Inactive) { - dialog?.dismiss() - dialog = null + when(uiState){ + is AddShortcutDialog, + is DeleteShortcutDialog, + is ResetShortcutDialog -> { + if (dialog == null){ + dialog = createDialog().also { it.show() } + } + } + is ShortcutCustomizationUiState.Inactive -> { + dialog?.dismiss() + dialog = null + } } } awaitCancellation() diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt index 79293077bc4c..7d9e010e31fa 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelper.kt @@ -19,6 +19,7 @@ package com.android.systemui.keyboard.shortcut.ui.composable import android.graphics.drawable.Icon import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -56,6 +57,7 @@ import androidx.compose.material.icons.automirrored.filled.OpenInNew import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.DeleteOutline import androidx.compose.material.icons.filled.ExpandMore +import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Search import androidx.compose.material.icons.filled.Tune import androidx.compose.material3.CenterAlignedTopAppBar @@ -113,7 +115,6 @@ import androidx.compose.ui.util.fastForEach import androidx.compose.ui.util.fastForEachIndexed import com.android.compose.modifiers.thenIf import com.android.compose.ui.graphics.painter.rememberDrawablePainter -import com.android.systemui.keyboard.shortcut.shared.model.Shortcut as ShortcutModel import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCategoryType import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCommand import com.android.systemui.keyboard.shortcut.shared.model.ShortcutCustomizationRequestInfo @@ -125,6 +126,7 @@ import com.android.systemui.keyboard.shortcut.ui.model.ShortcutCategoryUi import com.android.systemui.keyboard.shortcut.ui.model.ShortcutsUiState import com.android.systemui.res.R import kotlinx.coroutines.delay +import com.android.systemui.keyboard.shortcut.shared.model.Shortcut as ShortcutModel @Composable fun ShortcutHelper( @@ -187,6 +189,7 @@ private fun ActiveShortcutHelper( onKeyboardSettingsClicked, shortcutsUiState.isShortcutCustomizerFlagEnabled, onCustomizationRequested, + shortcutsUiState.shouldShowResetButton ) } } @@ -377,6 +380,7 @@ private fun ShortcutHelperTwoPane( onKeyboardSettingsClicked: () -> Unit, isShortcutCustomizerFlagEnabled: Boolean, onCustomizationRequested: (ShortcutCustomizationRequestInfo) -> Unit = {}, + shouldShowResetButton: Boolean ) { val selectedCategory = categories.fastFirstOrNull { it.type == selectedCategoryType } var isCustomizing by remember { mutableStateOf(false) } @@ -389,11 +393,14 @@ private fun ShortcutHelperTwoPane( TitleBar(isCustomizing) } if (isShortcutCustomizerFlagEnabled) { - if (isCustomizing) { - DoneButton(onClick = { isCustomizing = false }) - } else { - CustomizeButton(onClick = { isCustomizing = true }) - } + CustomizationButtonsContainer( + isCustomizing = isCustomizing, + onToggleCustomizationMode = { isCustomizing = !isCustomizing }, + onReset = { + onCustomizationRequested(ShortcutCustomizationRequestInfo.Reset) + }, + shouldShowResetButton = shouldShowResetButton, + ) } else { Spacer(modifier = Modifier.width(if (isCustomizing) 69.dp else 133.dp)) } @@ -422,6 +429,38 @@ private fun ShortcutHelperTwoPane( } @Composable +private fun CustomizationButtonsContainer( + isCustomizing: Boolean, + shouldShowResetButton: Boolean, + onToggleCustomizationMode: () -> Unit, + onReset: () -> Unit, +) { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + if (isCustomizing) { + if (shouldShowResetButton) { + ResetButton(onClick = onReset) + } + DoneButton(onClick = onToggleCustomizationMode) + } else { + CustomizeButton(onClick = onToggleCustomizationMode) + } + } +} + +@Composable +private fun ResetButton(onClick: () -> Unit) { + ShortcutHelperButton( + onClick = onClick, + color = Color.Transparent, + width = 99.dp, + iconSource = IconSource(imageVector = Icons.Default.Refresh), + text = stringResource(id = R.string.shortcut_helper_reset_button_text), + contentColor = MaterialTheme.colorScheme.primary, + border = BorderStroke(color = MaterialTheme.colorScheme.outlineVariant, width = 1.dp), + ) +} + +@Composable private fun CustomizeButton(onClick: () -> Unit) { ShortcutHelperButton( onClick = onClick, @@ -526,7 +565,7 @@ private fun SubCategoryContainerDualPane( modifier = Modifier.padding(vertical = 8.dp), searchQuery = searchQuery, shortcut = shortcut, - isCustomizing = isCustomizing, + isCustomizing = isCustomizing && shortcut.isCustomizable, onCustomizationRequested = { requestInfo -> when (requestInfo) { is ShortcutCustomizationRequestInfo.Add -> diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/Surfaces.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/Surfaces.kt index 58ce194694df..55c0fe297bcb 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/Surfaces.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/Surfaces.kt @@ -228,74 +228,8 @@ fun ShortcutHelperButton( contentColor: Color, contentPaddingHorizontal: Dp = 16.dp, contentPaddingVertical: Dp = 10.dp, -) { - ClickableShortcutSurface( - onClick = onClick, - shape = shape, - color = color, - modifier = modifier.semantics { role = Role.Button }.width(width).height(height), - interactionsConfig = - InteractionsConfig( - hoverOverlayColor = MaterialTheme.colorScheme.onSurface, - hoverOverlayAlpha = 0.11f, - pressedOverlayColor = MaterialTheme.colorScheme.onSurface, - pressedOverlayAlpha = 0.15f, - focusOutlineColor = MaterialTheme.colorScheme.secondary, - focusOutlineStrokeWidth = 3.dp, - focusOutlinePadding = 2.dp, - surfaceCornerRadius = 28.dp, - focusOutlineCornerRadius = 33.dp, - ), - ) { - Row( - modifier = - Modifier.padding( - horizontal = contentPaddingHorizontal, - vertical = contentPaddingVertical, - ), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center, - ) { - if (iconSource.imageVector != null) { - Icon( - tint = contentColor, - imageVector = iconSource.imageVector, - contentDescription = null, - modifier = Modifier.size(20.dp).wrapContentSize(Alignment.Center), - ) - } - - if (iconSource.imageVector != null && text != null) { - Spacer(modifier = Modifier.weight(1f)) - } - - if (text != null) { - Text( - text, - color = contentColor, - fontSize = 14.sp, - style = MaterialTheme.typography.labelLarge, - modifier = Modifier.wrapContentSize(Alignment.Center), - ) - } - } - } -} - -@Composable -fun ShortcutHelperButton( - modifier: Modifier = Modifier, - onClick: () -> Unit, - shape: Shape = RoundedCornerShape(360.dp), - color: Color, - width: Dp, - height: Dp = 40.dp, - iconSource: IconSource = IconSource(), - text: String? = null, - contentColor: Color, - contentPaddingHorizontal: Dp = 16.dp, - contentPaddingVertical: Dp = 10.dp, enabled: Boolean = true, + border: BorderStroke? = null, ) { ShortcutHelperButtonSurface( onClick = onClick, @@ -305,6 +239,7 @@ fun ShortcutHelperButton( enabled = enabled, width = width, height = height, + border = border, ) { Row( modifier = @@ -342,7 +277,7 @@ fun ShortcutHelperButton( } @Composable -fun ShortcutHelperButtonSurface( +private fun ShortcutHelperButtonSurface( onClick: () -> Unit, shape: Shape, color: Color, @@ -350,6 +285,7 @@ fun ShortcutHelperButtonSurface( enabled: Boolean, width: Dp, height: Dp, + border: BorderStroke?, content: @Composable () -> Unit, ) { if (enabled) { @@ -357,6 +293,7 @@ fun ShortcutHelperButtonSurface( onClick = onClick, shape = shape, color = color, + border = border, modifier = modifier.semantics { role = Role.Button }.width(width).height(height), interactionsConfig = InteractionsConfig( diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutCategoryUi.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutCategoryUi.kt index f5d478b5855d..27287721b333 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutCategoryUi.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutCategoryUi.kt @@ -31,4 +31,6 @@ data class ShortcutCategoryUi( iconSource: IconSource, shortcutCategory: ShortcutCategory, ) : this(label, iconSource, shortcutCategory.type, shortcutCategory.subCategories) + + val containsCustomShortcuts: Boolean = subCategories.any { it.containsCustomShortcuts } } diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutCustomizationUiState.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutCustomizationUiState.kt index bfc9486552a5..36c5ae0717be 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutCustomizationUiState.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutCustomizationUiState.kt @@ -23,17 +23,12 @@ sealed interface ShortcutCustomizationUiState { val shortcutLabel: String, val errorMessage: String = "", val defaultCustomShortcutModifierKey: ShortcutKey.Icon.ResIdIcon, - val isDialogShowing: Boolean = false, val pressedKeys: List<ShortcutKey> = emptyList(), ) : ShortcutCustomizationUiState - data class DeleteShortcutDialog( - val isDialogShowing: Boolean = false - ) : ShortcutCustomizationUiState + data object DeleteShortcutDialog : ShortcutCustomizationUiState - data class ResetShortcutDialog( - val isDialogShowing: Boolean = false - ) : ShortcutCustomizationUiState + data object ResetShortcutDialog : ShortcutCustomizationUiState data object Inactive : ShortcutCustomizationUiState } diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutsUiState.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutsUiState.kt index 02b0b43ea979..52ab157a0e70 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutsUiState.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutsUiState.kt @@ -25,6 +25,7 @@ sealed interface ShortcutsUiState { val shortcutCategories: List<ShortcutCategoryUi>, val defaultSelectedCategory: ShortcutCategoryType?, val isShortcutCustomizerFlagEnabled: Boolean = false, + val shouldShowResetButton: Boolean = false, ) : ShortcutsUiState data object Inactive : ShortcutsUiState diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModel.kt index 76a2e6095f01..92e25929fe4f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutCustomizationViewModel.kt @@ -73,32 +73,22 @@ constructor( shortcutLabel = requestInfo.label, defaultCustomShortcutModifierKey = shortcutCustomizationInteractor.getDefaultCustomShortcutModifierKey(), - isDialogShowing = false, pressedKeys = emptyList(), ) shortcutCustomizationInteractor.onCustomizationRequested(requestInfo) } is ShortcutCustomizationRequestInfo.Delete -> { - _shortcutCustomizationUiState.value = DeleteShortcutDialog(isDialogShowing = false) + _shortcutCustomizationUiState.value = DeleteShortcutDialog shortcutCustomizationInteractor.onCustomizationRequested(requestInfo) } ShortcutCustomizationRequestInfo.Reset -> { - _shortcutCustomizationUiState.value = ResetShortcutDialog(isDialogShowing = false) + _shortcutCustomizationUiState.value = ResetShortcutDialog } } } - fun onDialogShown() { - _shortcutCustomizationUiState.update { uiState -> - (uiState as? AddShortcutDialog)?.copy(isDialogShowing = true) - ?: (uiState as? DeleteShortcutDialog)?.copy(isDialogShowing = true) - ?: (uiState as? ResetShortcutDialog)?.copy(isDialogShowing = true) - ?: uiState - } - } - fun onDialogDismissed() { _shortcutCustomizationUiState.value = ShortcutCustomizationUiState.Inactive shortcutCustomizationInteractor.onCustomizationRequested(null) diff --git a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModel.kt b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModel.kt index 08fd0af81006..0f5f07393114 100644 --- a/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModel.kt @@ -17,6 +17,7 @@ package com.android.systemui.keyboard.shortcut.ui.viewmodel import android.app.role.RoleManager +import android.content.Context import android.content.pm.PackageManager.NameNotFoundException import android.util.Log import androidx.compose.material.icons.Icons @@ -40,7 +41,6 @@ import com.android.systemui.keyboard.shortcut.ui.model.ShortcutCategoryUi import com.android.systemui.keyboard.shortcut.ui.model.ShortcutsUiState import com.android.systemui.res.R import com.android.systemui.settings.UserTracker -import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow @@ -51,10 +51,12 @@ import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.withContext +import javax.inject.Inject class ShortcutHelperViewModel @Inject constructor( + private val context: Context, private val roleManager: RoleManager, private val userTracker: UserTracker, @Background private val backgroundScope: CoroutineScope, @@ -88,6 +90,7 @@ constructor( shortcutCategories = shortcutCategoriesUi, defaultSelectedCategory = getDefaultSelectedCategory(filteredCategories), isShortcutCustomizerFlagEnabled = keyboardShortcutHelperShortcutCustomizer(), + shouldShowResetButton = shouldShowResetButton(shortcutCategoriesUi) ) } } @@ -97,6 +100,10 @@ constructor( initialValue = ShortcutsUiState.Inactive, ) + private fun shouldShowResetButton(categoriesUi: List<ShortcutCategoryUi>): Boolean { + return categoriesUi.any { it.containsCustomShortcuts } + } + private fun convertCategoriesModelToUiModel( categories: List<ShortcutCategory> ): List<ShortcutCategoryUi> { @@ -136,13 +143,13 @@ constructor( private fun getShortcutCategoryLabel(type: ShortcutCategoryType): String = when (type) { ShortcutCategoryType.System -> - userContext.getString(R.string.shortcut_helper_category_system) + context.getString(R.string.shortcut_helper_category_system) ShortcutCategoryType.MultiTasking -> - userContext.getString(R.string.shortcut_helper_category_multitasking) + context.getString(R.string.shortcut_helper_category_multitasking) ShortcutCategoryType.InputMethodEditor -> - userContext.getString(R.string.shortcut_helper_category_input) + context.getString(R.string.shortcut_helper_category_input) ShortcutCategoryType.AppCategories -> - userContext.getString(R.string.shortcut_helper_category_app_shortcuts) + context.getString(R.string.shortcut_helper_category_app_shortcuts) is CurrentApp -> getApplicationLabelForCurrentApp(type) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java index 0101e099084e..096439b1008d 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/dagger/KeyguardModule.java @@ -62,6 +62,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor; import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionBootInteractor; import com.android.systemui.keyguard.domain.interactor.StartKeyguardTransitionModule; import com.android.systemui.keyguard.ui.transitions.DeviceEntryIconTransitionModule; +import com.android.systemui.keyguard.ui.view.AlternateBouncerWindowViewBinder; import com.android.systemui.keyguard.ui.viewmodel.KeyguardQuickAffordancesCombinedViewModelModule; import com.android.systemui.log.SessionTracker; import com.android.systemui.navigationbar.NavigationModeController; @@ -248,4 +249,10 @@ public interface KeyguardModule { @IntoMap @ClassKey(KeyguardUpdateMonitor.class) CoreStartable bindsKeyguardUpdateMonitor(KeyguardUpdateMonitor keyguardUpdateMonitor); + + /***/ + @Binds + @IntoMap + @ClassKey(AlternateBouncerWindowViewBinder.class) + CoreStartable bindsAlternateBouncerWindowViewBinder(AlternateBouncerWindowViewBinder binder); } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/GlanceableHubQuickAffordanceConfig.kt b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/GlanceableHubQuickAffordanceConfig.kt index 8906156252a6..71f29c0062bc 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/GlanceableHubQuickAffordanceConfig.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/GlanceableHubQuickAffordanceConfig.kt @@ -17,6 +17,8 @@ package com.android.systemui.keyguard.data.quickaffordance import android.content.Context +import android.content.Intent +import android.provider.Settings import android.util.Log import com.android.systemui.Flags.glanceableHubShortcutButton import com.android.systemui.animation.Expandable @@ -86,7 +88,13 @@ constructor( } else if (!communalInteractor.isCommunalEnabled.value) { Log.i(TAG, "Button disabled in picker: hub not enabled in settings.") KeyguardQuickAffordanceConfig.PickerScreenState.Disabled( - context.getString(R.string.glanceable_hub_lockscreen_affordance_disabled_text) + explanation = + context.getString(R.string.glanceable_hub_lockscreen_affordance_disabled_text), + actionText = + context.getString( + R.string.glanceable_hub_lockscreen_affordance_action_button_label + ), + actionIntent = Intent(Settings.ACTION_LOCKSCREEN_SETTINGS), ) } else { KeyguardQuickAffordanceConfig.PickerScreenState.Default() diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissInteractor.kt b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissInteractor.kt index 2d7da38535b1..0a4022ad4de8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissInteractor.kt @@ -16,6 +16,7 @@ package com.android.systemui.keyguard.domain.interactor +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.internal.policy.IKeyguardDismissCallback import com.android.systemui.bouncer.domain.interactor.AlternateBouncerInteractor import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerInteractor @@ -39,7 +40,6 @@ import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge -import com.android.app.tracing.coroutines.launchTraced as launch import kotlinx.coroutines.withContext /** Encapsulates business logic for requesting the keyguard to dismiss/finish/done. */ @@ -53,8 +53,8 @@ constructor( private val primaryBouncerInteractor: PrimaryBouncerInteractor, private val selectedUserInteractor: SelectedUserInteractor, private val dismissCallbackRegistry: DismissCallbackRegistry, + private val alternateBouncerInteractor: AlternateBouncerInteractor, trustRepository: TrustRepository, - alternateBouncerInteractor: AlternateBouncerInteractor, powerInteractor: PowerInteractor, ) { /* @@ -151,13 +151,16 @@ constructor( dismissCallbackRegistry.addCallback(callback) } - // This will either show the bouncer, or dismiss the keyguard if insecure. - // We currently need to request showing the primary bouncer in order to start a - // transition to PRIMARY_BOUNCER. Once we refactor that so that starting the - // transition is what causes the bouncer to show, we can remove this entire method, - // and simply ask KeyguardTransitionInteractor to transition to a bouncer state or - // dismiss keyguard. - primaryBouncerInteractor.show(true) + // This will either show the bouncer, or dismiss the keyguard if insecure. We + // currently need to request showing the bouncer in order to start a transition to + // *_BOUNCER. Once we refactor that so that starting the transition is what causes + // the bouncer to show, we can remove this entire method, and simply call + // KeyguardDismissTransitionInteractor#startDismissKeyguardTransition. + if (alternateBouncerInteractor.canShowAlternateBouncer.value) { + alternateBouncerInteractor.forceShow() + } else { + primaryBouncerInteractor.show(true) + } } } } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt index 7a368999ecc9..33783b515763 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/AlternateBouncerViewBinder.kt @@ -16,9 +16,7 @@ package com.android.systemui.keyguard.ui.binder -import android.graphics.PixelFormat import android.util.Log -import android.view.Gravity import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -36,6 +34,7 @@ import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.deviceentry.ui.binder.UdfpsAccessibilityOverlayBinder import com.android.systemui.deviceentry.ui.view.UdfpsAccessibilityOverlay import com.android.systemui.deviceentry.ui.viewmodel.AlternateBouncerUdfpsAccessibilityOverlayViewModel +import com.android.systemui.keyguard.ui.view.AlternateBouncerWindowViewLayoutParams import com.android.systemui.keyguard.ui.view.DeviceEntryIconView import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerDependencies import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerUdfpsIconViewModel @@ -68,28 +67,6 @@ constructor( private val windowManager: Lazy<WindowManager>, private val layoutInflater: Lazy<LayoutInflater>, ) : CoreStartable { - private val layoutParams: WindowManager.LayoutParams - get() = - WindowManager.LayoutParams( - WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG, - WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or - WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, - PixelFormat.TRANSLUCENT, - ) - .apply { - title = "AlternateBouncerView" - fitInsetsTypes = 0 // overrides default, avoiding status bars during layout - gravity = Gravity.TOP or Gravity.LEFT - layoutInDisplayCutoutMode = - WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS - privateFlags = - WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY or - WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION - // Avoid announcing window title. - accessibilityTitle = " " - } private var alternateBouncerView: ConstraintLayout? = null @@ -176,7 +153,9 @@ constructor( as ConstraintLayout Log.d(TAG, "Adding alternate bouncer view") - windowManager.get().addView(alternateBouncerView, layoutParams) + windowManager + .get() + .addView(alternateBouncerView, AlternateBouncerWindowViewLayoutParams.layoutParams) alternateBouncerView!!.addOnAttachStateChangeListener(onAttachAddBackGestureHandler) } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt index 8cae77756721..273d763a8c57 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardClockViewBinder.kt @@ -170,6 +170,18 @@ object KeyguardClockViewBinder { } } + disposables += + keyguardRootView.repeatWhenAttached { + repeatOnLifecycle(Lifecycle.State.STARTED) { + viewModel.currentClock.collect { currentClock -> + currentClock?.apply { + smallClock.run { events.onThemeChanged(theme) } + largeClock.run { events.onThemeChanged(theme) } + } + } + } + } + return disposables } diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt index 494de9a80560..eab752877520 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt @@ -188,7 +188,8 @@ constructor( private val shortcutsBindings = mutableSetOf<KeyguardQuickAffordanceViewBinder.Binding>() private val coroutineScope: CoroutineScope - private var themeStyle: Style? = null + + @Style.Type private var themeStyle: Int? = null init { coroutineScope = @@ -660,6 +661,7 @@ constructor( // Seed color null means users do not override any color on the clock. The default // color will need to use wallpaper's extracted color and consider if the // wallpaper's color is dark or light. + @Style.Type val style = themeStyle ?: fetchThemeStyleFromSetting().also { themeStyle = it } val wallpaperColorScheme = ColorScheme(colors, false, style) val lightClockColor = wallpaperColorScheme.accent1.s100 @@ -678,6 +680,7 @@ constructor( } // In clock preview, we should have a seed color for clock // before setting clock to clockEventController to avoid updateColor with seedColor == null + // So in update colors, it should already have the correct theme in clockFaceController if (MigrateClocksToBlueprint.isEnabled) { clockController.clock = clock } @@ -712,7 +715,8 @@ constructor( } } - private suspend fun fetchThemeStyleFromSetting(): Style { + @Style.Type + private suspend fun fetchThemeStyleFromSetting(): Int { val overlayPackageJson = withContext(backgroundDispatcher) { secureSettings.getString(Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES) diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewBinder.kt new file mode 100644 index 000000000000..d3bc79eb89e2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewBinder.kt @@ -0,0 +1,102 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.view + +import android.content.Context +import android.view.View +import android.view.WindowManager +import android.widget.FrameLayout +import androidx.compose.ui.platform.ComposeView +import com.android.systemui.CoreStartable +import com.android.systemui.compose.ComposeInitializer +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.keyguard.ui.composable.AlternateBouncer +import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerDependencies +import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerViewModel +import com.android.systemui.lifecycle.repeatWhenAttached +import com.android.systemui.lifecycle.repeatWhenAttachedToWindow +import com.android.systemui.scene.shared.flag.SceneContainerFlag +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.awaitCancellation +import kotlinx.coroutines.flow.distinctUntilChanged +import kotlinx.coroutines.flow.filter +import kotlinx.coroutines.launch + +/** Drives the showing and hiding of the alternate bouncer window. */ +@SysUISingleton +class AlternateBouncerWindowViewBinder +@Inject +constructor( + @Application private val applicationScope: CoroutineScope, + @Application private val context: Context, + private val viewModel: AlternateBouncerViewModel, + private val dependencies: AlternateBouncerDependencies, + private val windowManager: WindowManager, +) : CoreStartable { + + override fun start() { + if (!SceneContainerFlag.isEnabled) { + return + } + + applicationScope.launch { + viewModel.isVisible + .distinctUntilChanged() + .filter { it } + .collect { + windowManager.addView( + createView(), + AlternateBouncerWindowViewLayoutParams.layoutParams, + ) + } + } + } + + private fun createView(): View { + val root = FrameLayout(context) + val composeView = + ComposeView(context).apply { + setContent { + AlternateBouncer( + alternateBouncerDependencies = dependencies, + onHideAnimationFinished = { + if (root.isAttachedToWindow) { + windowManager.removeView(root) + } + }, + ) + } + } + + root.repeatWhenAttached { + root.repeatWhenAttachedToWindow { + try { + ComposeInitializer.onAttachedToWindow(root) + root.addView(composeView) + awaitCancellation() + } finally { + root.removeView(composeView) + ComposeInitializer.onDetachedFromWindow(root) + } + } + } + + return root + } +} diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewLayoutParams.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewLayoutParams.kt new file mode 100644 index 000000000000..5585c21aa217 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/view/AlternateBouncerWindowViewLayoutParams.kt @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.ui.view + +import android.graphics.PixelFormat +import android.view.Gravity +import android.view.WindowManager + +object AlternateBouncerWindowViewLayoutParams { + val layoutParams: WindowManager.LayoutParams + get() = + WindowManager.LayoutParams( + WindowManager.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.MATCH_PARENT, + WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG, + WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or + WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED, + PixelFormat.TRANSLUCENT, + ) + .apply { + title = "AlternateBouncerView" + fitInsetsTypes = 0 // overrides default, avoiding status bars during layout + gravity = Gravity.TOP or Gravity.LEFT + layoutInDisplayCutoutMode = + WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS + privateFlags = + WindowManager.LayoutParams.PRIVATE_FLAG_TRUSTED_OVERLAY or + WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION + // Avoid announcing window title. + accessibilityTitle = " " + } +} diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaFilterRepository.kt b/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaFilterRepository.kt index 341b8d87eeef..1b39d55d1f0f 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaFilterRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/data/repository/MediaFilterRepository.kt @@ -30,14 +30,10 @@ import com.android.systemui.media.controls.util.MediaSmartspaceLogger import com.android.systemui.media.controls.util.MediaSmartspaceLogger.Companion.SMARTSPACE_CARD_DISMISS_EVENT import com.android.systemui.media.controls.util.MediaSmartspaceLogger.Companion.SMARTSPACE_CARD_SEEN_EVENT import com.android.systemui.media.controls.util.SmallHash -import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.util.time.SystemClock -import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import java.util.Locale import java.util.TreeMap import javax.inject.Inject -import kotlinx.coroutines.channels.awaitClose -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow @@ -49,37 +45,9 @@ class MediaFilterRepository constructor( @Application private val applicationContext: Context, private val systemClock: SystemClock, - private val configurationController: ConfigurationController, private val smartspaceLogger: MediaSmartspaceLogger, ) { - val onAnyMediaConfigurationChange: Flow<Unit> = conflatedCallbackFlow { - val callback = - object : ConfigurationController.ConfigurationListener { - override fun onDensityOrFontScaleChanged() { - trySend(Unit) - } - - override fun onThemeChanged() { - trySend(Unit) - } - - override fun onUiModeChanged() { - trySend(Unit) - } - - override fun onLocaleListChanged() { - if (locale != applicationContext.resources.configuration.locales.get(0)) { - locale = applicationContext.resources.configuration.locales.get(0) - trySend(Unit) - } - } - } - configurationController.addCallback(callback) - trySend(Unit) - awaitClose { configurationController.removeCallback(callback) } - } - /** Instance id of media control that recommendations card reactivated. */ private val _reactivatedId: MutableStateFlow<InstanceId?> = MutableStateFlow(null) val reactivatedId: StateFlow<InstanceId?> = _reactivatedId.asStateFlow() @@ -190,7 +158,7 @@ constructor( fun addMediaDataLoadingState( mediaDataLoadingModel: MediaDataLoadingModel, - isUpdate: Boolean = true + isUpdate: Boolean = true, ) { val sortedMap = TreeMap<MediaSortKeyModel, MediaCommonModel>(comparator) sortedMap.putAll( @@ -395,7 +363,7 @@ constructor( logSmarspaceRecommendationCardUserEvent( SMARTSPACE_CARD_SEEN_EVENT, surface, - visibleIndex + visibleIndex, ) } } @@ -409,7 +377,7 @@ constructor( interactedSubCardRank: Int = 0, interactedSubCardCardinality: Int = 0, instanceId: InstanceId? = null, - isRec: Boolean = false + isRec: Boolean = false, ) { _currentMedia.value.forEachIndexed { index, mediaCommonModel -> when (mediaCommonModel) { @@ -423,7 +391,7 @@ constructor( surface, mediaCommonModel.mediaLoadedModel.isSsReactivated, interactedSubCardRank, - interactedSubCardCardinality + interactedSubCardCardinality, ) } return @@ -437,7 +405,7 @@ constructor( surface, index, interactedSubCardRank, - interactedSubCardCardinality + interactedSubCardCardinality, ) } return @@ -459,14 +427,14 @@ constructor( SMARTSPACE_CARD_DISMISS_EVENT, surface, mediaCommonModel.mediaLoadedModel.isSsReactivated, - isSwipeToDismiss = true + isSwipeToDismiss = true, ) is MediaCommonModel.MediaRecommendations -> logSmarspaceRecommendationCardUserEvent( SMARTSPACE_CARD_DISMISS_EVENT, surface, index, - isSwipeToDismiss = true + isSwipeToDismiss = true, ) } } @@ -513,7 +481,7 @@ constructor( isReactivated: Boolean, interactedSubCardRank: Int = 0, interactedSubCardCardinality: Int = 0, - isSwipeToDismiss: Boolean = false + isSwipeToDismiss: Boolean = false, ) { _selectedUserEntries.value[instanceId]?.let { smartspaceLogger.logSmartspaceCardUIEvent( @@ -537,7 +505,7 @@ constructor( index: Int, interactedSubCardRank: Int = 0, interactedSubCardCardinality: Int = 0, - isSwipeToDismiss: Boolean = false + isSwipeToDismiss: Boolean = false, ) { smartspaceLogger.logSmartspaceCardUIEvent( eventId, diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaControlInteractor.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaControlInteractor.kt index 1f339dddd4d1..09aa85b74d2a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaControlInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaControlInteractor.kt @@ -68,8 +68,6 @@ constructor( .map { entries -> entries[instanceId]?.let { toMediaControlModel(it) } } .distinctUntilChanged() - val onAnyMediaConfigurationChange: Flow<Unit> = repository.onAnyMediaConfigurationChange - fun removeMediaControl( token: MediaSession.Token?, instanceId: InstanceId, diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaRecommendationsInteractor.kt b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaRecommendationsInteractor.kt index c3a36b258842..48ed3915dedd 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaRecommendationsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/domain/pipeline/interactor/MediaRecommendationsInteractor.kt @@ -66,14 +66,12 @@ constructor( .distinctUntilChanged() .stateIn(applicationScope, SharingStarted.WhileSubscribed(), false) - val onAnyMediaConfigurationChange: Flow<Unit> = repository.onAnyMediaConfigurationChange - fun removeMediaRecommendations( key: String, dismissIntent: Intent?, delayMs: Long, eventId: Int, - location: Int + location: Int, ) { logSmartspaceCardUserEvent(eventId, location) mediaDataProcessor.dismissSmartspaceRecommendation(key, delayMs) @@ -101,7 +99,7 @@ constructor( eventId: Int, location: Int, interactedSubCardRank: Int, - interactedSubCardCardinality: Int + interactedSubCardCardinality: Int, ) { if (interactedSubCardRank == -1) { logSmartspaceCardUserEvent(eventId, MediaSmartspaceLogger.getSurface(location)) @@ -111,7 +109,7 @@ constructor( MediaSmartspaceLogger.getSurface(location), interactedSubCardRank = interactedSubCardRank, interactedSubCardCardinality = interactedSubCardCardinality, - isRec = true + isRec = true, ) } if (shouldActivityOpenInForeground(intent)) { @@ -121,7 +119,7 @@ constructor( 0 /* delay */, expandable.activityTransitionController( InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_MEDIA_PLAYER - ) + ), ) } else { // Otherwise, open the activity in background directly. @@ -133,7 +131,7 @@ constructor( repository.logSmartspaceCardUserEvent( eventId, MediaSmartspaceLogger.getSurface(location), - isRec = true + isRec = true, ) } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/MediaControlViewBinder.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/MediaControlViewBinder.kt index a6e1582d4e0c..910d3a84aeae 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/MediaControlViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/binder/MediaControlViewBinder.kt @@ -34,6 +34,7 @@ import android.widget.ImageButton import androidx.constraintlayout.widget.ConstraintSet import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.settingslib.widget.AdaptiveIcon import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.Icon @@ -64,7 +65,6 @@ import com.android.systemui.surfaceeffects.ripple.RippleAnimationConfig import com.android.systemui.surfaceeffects.ripple.RippleShader import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.collectLatest -import com.android.app.tracing.coroutines.launchTraced as launch import kotlinx.coroutines.withContext private const val TAG = "MediaControlViewBinder" @@ -85,7 +85,7 @@ object MediaControlViewBinder { launch { viewModel.player.collectLatest { player -> player?.let { - if (viewModel.isNewPlayer(it)) { + if (viewModel.setPlayer(it)) { bindMediaCard( viewHolder, viewController, diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt index 43c20117b6e0..f0f8a9592b6f 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaCarouselController.kt @@ -37,6 +37,7 @@ import androidx.annotation.VisibleForTesting import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle import androidx.recyclerview.widget.DiffUtil +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.app.tracing.traceSection import com.android.internal.logging.InstanceId import com.android.keyguard.KeyguardUpdateMonitor @@ -115,7 +116,6 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn -import com.android.app.tracing.coroutines.launchTraced as launch import kotlinx.coroutines.withContext private const val TAG = "MediaCarouselController" @@ -752,7 +752,11 @@ constructor( } } - private fun onAdded(commonViewModel: MediaCommonViewModel, position: Int) { + private fun onAdded( + commonViewModel: MediaCommonViewModel, + position: Int, + configChanged: Boolean = false, + ) { val viewController = mediaViewControllerFactory.get() viewController.sizeChangedListener = this::updateCarouselDimensions val lp = @@ -763,12 +767,13 @@ constructor( when (commonViewModel) { is MediaCommonViewModel.MediaControl -> { val viewHolder = MediaViewHolder.create(LayoutInflater.from(context), mediaContent) - if (SceneContainerFlag.isEnabled) { - viewController.widthInSceneContainerPx = widthInSceneContainerPx - viewController.heightInSceneContainerPx = heightInSceneContainerPx - } + viewController.widthInSceneContainerPx = widthInSceneContainerPx + viewController.heightInSceneContainerPx = heightInSceneContainerPx viewController.attachPlayer(viewHolder) viewController.mediaViewHolder?.player?.layoutParams = lp + if (configChanged) { + commonViewModel.controlViewModel.onMediaConfigChanged() + } MediaControlViewBinder.bind( viewHolder, commonViewModel.controlViewModel, @@ -1271,23 +1276,14 @@ constructor( ColorStateList.valueOf(context.getColor(R.color.media_paging_indicator)) if (recreateMedia) { mediaContent.removeAllViews() - commonViewModels.forEach { viewModel -> + commonViewModels.forEachIndexed { index, viewModel -> when (viewModel) { - is MediaCommonViewModel.MediaControl -> { - controllerById[viewModel.instanceId.toString()]?.let { - it.widthInSceneContainerPx = widthInSceneContainerPx - it.heightInSceneContainerPx = heightInSceneContainerPx - mediaContent.addView(it.mediaViewHolder?.player) - } - } - is MediaCommonViewModel.MediaRecommendations -> { - controllerById[viewModel.key]?.let { - it.widthInSceneContainerPx = widthInSceneContainerPx - it.heightInSceneContainerPx = heightInSceneContainerPx - mediaContent.addView(it.recommendationViewHolder?.recommendations) - } - } + is MediaCommonViewModel.MediaControl -> + controllerById[viewModel.instanceId.toString()]?.onDestroy() + is MediaCommonViewModel.MediaRecommendations -> + controllerById[viewModel.key]?.onDestroy() } + onAdded(viewModel, index, configChanged = true) } } } diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/util/MediaArtworkHelper.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/util/MediaArtworkHelper.kt index c21513b1263a..14a4e2656d7d 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/util/MediaArtworkHelper.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/util/MediaArtworkHelper.kt @@ -98,7 +98,11 @@ object MediaArtworkHelper { } /** Returns [ColorScheme] of media app given its [icon]. */ - fun getColorScheme(icon: Drawable, tag: String, style: Style = Style.TONAL_SPOT): ColorScheme? { + fun getColorScheme( + icon: Drawable, + tag: String, + @Style.Type style: Int = Style.TONAL_SPOT, + ): ColorScheme? { return try { ColorScheme(WallpaperColors.fromDrawable(icon), true, style) } catch (e: PackageManager.NameNotFoundException) { diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModel.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModel.kt index 4173d2aa272e..4e97f2015c12 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaControlViewModel.kt @@ -41,10 +41,8 @@ import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.res.R import java.util.concurrent.Executor import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map @@ -56,15 +54,9 @@ class MediaControlViewModel( private val interactor: MediaControlInteractor, private val logger: MediaUiEventLogger, ) { - - @OptIn(ExperimentalCoroutinesApi::class) val player: Flow<MediaPlayerViewModel?> = - interactor.onAnyMediaConfigurationChange - .flatMapLatest { - interactor.mediaControl.map { mediaControl -> - mediaControl?.let { toViewModel(it) } - } - } + interactor.mediaControl + .map { mediaControl -> mediaControl?.let { toViewModel(it) } } .distinctUntilChanged { old, new -> (new == null && old == null) || new?.contentEquals(old) ?: false } @@ -74,14 +66,21 @@ class MediaControlViewModel( private var isAnyButtonClicked = false @MediaLocation private var location = MediaHierarchyManager.LOCATION_UNKNOWN private var playerViewModel: MediaPlayerViewModel? = null + private var allowPlayerUpdate: Boolean = false + + fun setPlayer(viewModel: MediaPlayerViewModel): Boolean { + val tempViewModel = playerViewModel + playerViewModel = viewModel + return allowPlayerUpdate || !(tempViewModel?.contentEquals(viewModel) ?: false) + } - fun isNewPlayer(viewModel: MediaPlayerViewModel): Boolean { - val contentEquals = playerViewModel?.contentEquals(viewModel) ?: false - return (!contentEquals).also { playerViewModel = viewModel } + fun onMediaConfigChanged() { + allowPlayerUpdate = true } fun onMediaControlIsBound(artistName: CharSequence, titleName: CharSequence) { interactor.logMediaControlIsBound(artistName, titleName) + allowPlayerUpdate = false } private fun onDismissMediaData( diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaRecommendationsViewModel.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaRecommendationsViewModel.kt index 6bc6b10a1dfd..88cfbaf00987 100644 --- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaRecommendationsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/viewmodel/MediaRecommendationsViewModel.kt @@ -41,10 +41,8 @@ import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.res.R import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.distinctUntilChanged -import kotlinx.coroutines.flow.flatMapLatest import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map @@ -59,12 +57,9 @@ constructor( private val logger: MediaUiEventLogger, ) { - @OptIn(ExperimentalCoroutinesApi::class) val mediaRecsCard: Flow<MediaRecsCardViewModel?> = - interactor.onAnyMediaConfigurationChange - .flatMapLatest { - interactor.recommendations.map { recsCard -> toRecsViewModel(recsCard) } - } + interactor.recommendations + .map { recsCard -> toRecsViewModel(recsCard) } .distinctUntilChanged() .flowOn(backgroundDispatcher) diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt index 32de56f93427..e17255a7c2f0 100644 --- a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionDialogDelegate.kt @@ -50,22 +50,29 @@ abstract class BaseMediaProjectionPermissionDialogDelegate<T : AlertDialog>( @ScreenShareMode val defaultSelectedMode: Int = screenShareOptions.first().mode, ) : DialogDelegate<T>, AdapterView.OnItemSelectedListener { private lateinit var dialogTitle: TextView - private lateinit var startButton: TextView private lateinit var cancelButton: TextView - private lateinit var warning: TextView private lateinit var screenShareModeSpinner: Spinner protected lateinit var dialog: AlertDialog - private var shouldLogCancel: Boolean = true - var selectedScreenShareOption: ScreenShareOption = - screenShareOptions.first { it.mode == defaultSelectedMode } + protected lateinit var viewBinder: BaseMediaProjectionPermissionViewBinder + + /** + * Create the view binder for the permission dialog, this can be override by child classes to + * support a different type of view binder + */ + open fun createViewBinder(): BaseMediaProjectionPermissionViewBinder { + return BaseMediaProjectionPermissionViewBinder( + screenShareOptions, + appName, + hostUid, + mediaProjectionMetricsLogger, + defaultSelectedMode, + dialog, + ) + } @CallSuper override fun onStop(dialog: T) { - // onStop can be called multiple times and we only want to log once. - if (shouldLogCancel) { - mediaProjectionMetricsLogger.notifyProjectionRequestCancelled(hostUid) - shouldLogCancel = false - } + viewBinder.unbind() } @CallSuper @@ -75,12 +82,14 @@ abstract class BaseMediaProjectionPermissionDialogDelegate<T : AlertDialog>( dialog.window?.setGravity(Gravity.CENTER) dialog.setContentView(R.layout.screen_share_dialog) dialogTitle = dialog.requireViewById(R.id.screen_share_dialog_title) - warning = dialog.requireViewById(R.id.text_warning) - startButton = dialog.requireViewById(android.R.id.button1) cancelButton = dialog.requireViewById(android.R.id.button2) updateIcon() - initScreenShareOptions() createOptionsView(getOptionsViewLayoutId()) + if (!::viewBinder.isInitialized) { + viewBinder = createViewBinder() + } + viewBinder.bind() + initScreenShareSpinner() } private fun updateIcon() { @@ -93,18 +102,6 @@ abstract class BaseMediaProjectionPermissionDialogDelegate<T : AlertDialog>( } } - private fun initScreenShareOptions() { - selectedScreenShareOption = screenShareOptions.first { it.mode == defaultSelectedMode } - setOptionSpecificFields() - initScreenShareSpinner() - } - - private val warningText: String - get() = dialog.context.getString(selectedScreenShareOption.warningText, appName) - - private val startButtonText: String - get() = dialog.context.getString(selectedScreenShareOption.startButtonText) - private fun initScreenShareSpinner() { val adapter = OptionsAdapter(dialog.context.applicationContext, screenShareOptions) screenShareModeSpinner = dialog.requireViewById(R.id.screen_share_mode_options) @@ -128,18 +125,15 @@ abstract class BaseMediaProjectionPermissionDialogDelegate<T : AlertDialog>( } override fun onItemSelected(adapterView: AdapterView<*>?, view: View, pos: Int, id: Long) { - selectedScreenShareOption = screenShareOptions[pos] - setOptionSpecificFields() - } - - /** Sets fields on the dialog that change based on which option is selected. */ - private fun setOptionSpecificFields() { - warning.text = warningText - startButton.text = startButtonText + viewBinder.onItemSelected(pos) } override fun onNothingSelected(parent: AdapterView<*>?) {} + fun getSelectedScreenShareOption(): ScreenShareOption { + return viewBinder.selectedScreenShareOption + } + /** Protected methods for the text updates & functionality */ protected fun setDialogTitle(@StringRes stringId: Int) { val title = dialog.context.getString(stringId, appName) @@ -147,10 +141,7 @@ abstract class BaseMediaProjectionPermissionDialogDelegate<T : AlertDialog>( } protected fun setStartButtonOnClickListener(listener: View.OnClickListener?) { - startButton.setOnClickListener { view -> - shouldLogCancel = false - listener?.onClick(view) - } + viewBinder.setStartButtonOnClickListener(listener) } protected fun setCancelButtonOnClickListener(listener: View.OnClickListener?) { diff --git a/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionViewBinder.kt b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionViewBinder.kt new file mode 100644 index 000000000000..728255d168f2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/mediaprojection/permission/BaseMediaProjectionPermissionViewBinder.kt @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.mediaprojection.permission + +import android.app.AlertDialog +import android.view.View +import android.widget.TextView +import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger +import com.android.systemui.res.R + +open class BaseMediaProjectionPermissionViewBinder( + private val screenShareOptions: List<ScreenShareOption>, + private val appName: String?, + private val hostUid: Int, + private val mediaProjectionMetricsLogger: MediaProjectionMetricsLogger, + @ScreenShareMode val defaultSelectedMode: Int = screenShareOptions.first().mode, + private val dialog: AlertDialog, +) { + private lateinit var warning: TextView + private lateinit var startButton: TextView + var selectedScreenShareOption: ScreenShareOption = + screenShareOptions.first { it.mode == defaultSelectedMode } + private var shouldLogCancel: Boolean = true + + fun unbind() { + // unbind can be called multiple times and we only want to log once. + if (shouldLogCancel) { + mediaProjectionMetricsLogger.notifyProjectionRequestCancelled(hostUid) + shouldLogCancel = false + } + } + + open fun bind() { + warning = dialog.requireViewById(R.id.text_warning) + startButton = dialog.requireViewById(android.R.id.button1) + initScreenShareOptions() + } + + private fun initScreenShareOptions() { + selectedScreenShareOption = screenShareOptions.first { it.mode == defaultSelectedMode } + setOptionSpecificFields() + } + + /** Sets fields on the dialog that change based on which option is selected. */ + private fun setOptionSpecificFields() { + warning.text = warningText + startButton.text = startButtonText + } + + open fun onItemSelected(pos: Int) { + selectedScreenShareOption = screenShareOptions[pos] + setOptionSpecificFields() + } + + private val warningText: String + get() = dialog.context.getString(selectedScreenShareOption.warningText, appName) + + private val startButtonText: String + get() = dialog.context.getString(selectedScreenShareOption.startButtonText) + + fun setStartButtonOnClickListener(listener: View.OnClickListener?) { + startButton.setOnClickListener { view -> + shouldLogCancel = false + listener?.onClick(view) + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepository.kt b/packages/SystemUI/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepository.kt index debb667bbb15..a19c9b30f68d 100644 --- a/packages/SystemUI/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepository.kt @@ -16,6 +16,7 @@ package com.android.systemui.mediarouter.data.repository +import android.media.projection.StopReason import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.log.LogBuffer @@ -40,7 +41,7 @@ interface MediaRouterRepository { val castDevices: StateFlow<List<CastDevice>> /** Stops the cast to the given device. */ - fun stopCasting(device: CastDevice) + fun stopCasting(device: CastDevice, @StopReason stopReason: Int) } @SysUISingleton @@ -67,8 +68,8 @@ constructor( .map { it.filter { device -> device.origin == CastDevice.CastOrigin.MediaRouter } } .stateIn(scope, SharingStarted.WhileSubscribed(), emptyList()) - override fun stopCasting(device: CastDevice) { - castController.stopCasting(device) + override fun stopCasting(device: CastDevice, @StopReason stopReason: Int) { + castController.stopCasting(device, stopReason) } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt index eff5fc0db761..d8fc52bcc55a 100644 --- a/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt +++ b/packages/SystemUI/src/com/android/systemui/notetask/NoteTaskInitializer.kt @@ -216,20 +216,13 @@ constructor( "handleKeyGestureEvent: Received OPEN_NOTES gesture event from keycodes: " + event.keycodes.contentToString() } - if ( - event.keycodes.contains(KEYCODE_N) && - event.hasModifiers(KeyEvent.META_CTRL_ON or KeyEvent.META_META_ON) - ) { - debugLog { "Note task triggered by keyboard shortcut" } - backgroundExecutor.execute { controller.showNoteTask(KEYBOARD_SHORTCUT) } - return true - } if (event.keycodes.size == 1 && event.keycodes[0] == KEYCODE_STYLUS_BUTTON_TAIL) { debugLog { "Note task triggered by stylus tail button" } backgroundExecutor.execute { controller.showNoteTask(TAIL_BUTTON) } return true } - return false + backgroundExecutor.execute { controller.showNoteTask(KEYBOARD_SHORTCUT) } + return true } private fun isKeyGestureSupported(gestureType: Int): Boolean { diff --git a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt index 2a5ffc6cc391..5c9baa000d0b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt @@ -55,8 +55,7 @@ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_ import com.android.internal.config.sysui.SystemUiDeviceConfigFlags.TASK_MANAGER_SHOW_USER_VISIBLE_JOBS import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.Dumpable -import com.android.systemui.Flags; -import com.android.systemui.res.R +import com.android.systemui.Flags import com.android.systemui.animation.DialogCuj import com.android.systemui.animation.DialogTransitionAnimator import com.android.systemui.animation.Expandable @@ -65,7 +64,9 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.dump.DumpManager +import com.android.systemui.res.R import com.android.systemui.settings.UserTracker +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shared.system.SysUiStatsLog import com.android.systemui.statusbar.phone.SystemUIDialog import com.android.systemui.util.DeviceConfigProxy @@ -106,8 +107,8 @@ interface FgsManagerController { fun init() /** - * Show the foreground services dialog. The dialog will be expanded from [expandable] if - * it's not `null`. + * Show the foreground services dialog. The dialog will be expanded from [expandable] if it's + * not `null`. */ fun showDialog(expandable: Expandable?) @@ -123,8 +124,7 @@ interface FgsManagerController { /** Remove a [OnDialogDismissedListener]. */ fun removeOnDialogDismissedListener(listener: OnDialogDismissedListener) - @VisibleForTesting - fun visibleButtonsCount(): Int + @VisibleForTesting fun visibleButtonsCount(): Int interface OnNumberOfPackagesChangedListener { /** Called when [numRunningPackages] changed. */ @@ -138,8 +138,10 @@ interface FgsManagerController { } @SysUISingleton -class FgsManagerControllerImpl @Inject constructor( - @Main private val resources: Resources, +class FgsManagerControllerImpl +@Inject +constructor( + @ShadeDisplayAware private val resources: Resources, @Main private val mainExecutor: Executor, @Background private val backgroundExecutor: Executor, private val systemClock: SystemClock, @@ -187,50 +189,46 @@ class FgsManagerControllerImpl @Inject constructor( private val lock = Any() - @GuardedBy("lock") - var initialized = false + @GuardedBy("lock") var initialized = false - @GuardedBy("lock") - private var lastNumberOfVisiblePackages = 0 + @GuardedBy("lock") private var lastNumberOfVisiblePackages = 0 - @GuardedBy("lock") - private var currentProfileIds = mutableSetOf<Int>() + @GuardedBy("lock") private var currentProfileIds = mutableSetOf<Int>() @GuardedBy("lock") private val runningTaskIdentifiers = mutableMapOf<UserPackage, StartTimeAndIdentifiers>() - @GuardedBy("lock") - private var dialog: SystemUIDialog? = null + @GuardedBy("lock") private var dialog: SystemUIDialog? = null - @GuardedBy("lock") - private val appListAdapter: AppListAdapter = AppListAdapter() + @GuardedBy("lock") private val appListAdapter: AppListAdapter = AppListAdapter() /* Only mutate on the background thread */ private var runningApps: ArrayMap<UserPackage, RunningApp> = ArrayMap() - private val userTrackerCallback = object : UserTracker.Callback { - override fun onUserChanged(newUser: Int, userContext: Context) {} + private val userTrackerCallback = + object : UserTracker.Callback { + override fun onUserChanged(newUser: Int, userContext: Context) {} - override fun onProfilesChanged(profiles: List<UserInfo>) { - synchronized(lock) { - currentProfileIds.clear() - currentProfileIds.addAll(profiles.map { it.id }) - lastNumberOfVisiblePackages = 0 - updateNumberOfVisibleRunningPackagesLocked() + override fun onProfilesChanged(profiles: List<UserInfo>) { + synchronized(lock) { + currentProfileIds.clear() + currentProfileIds.addAll(profiles.map { it.id }) + lastNumberOfVisiblePackages = 0 + updateNumberOfVisibleRunningPackagesLocked() + } } } - } private val foregroundServiceObserver = ForegroundServiceObserver() private val userVisibleJobObserver = UserVisibleJobObserver() - private val stoppableApps by lazy { resources - .getStringArray(com.android.internal.R.array.stoppable_fgs_system_apps) + private val stoppableApps by lazy { + resources.getStringArray(com.android.internal.R.array.stoppable_fgs_system_apps) } - private val vendorStoppableApps by lazy { resources - .getStringArray(com.android.internal.R.array.vendor_stoppable_fgs_system_apps) + private val vendorStoppableApps by lazy { + resources.getStringArray(com.android.internal.R.array.vendor_stoppable_fgs_system_apps) } override fun init() { @@ -239,14 +237,19 @@ class FgsManagerControllerImpl @Inject constructor( return } - showUserVisibleJobs = deviceConfigProxy.getBoolean( - NAMESPACE_SYSTEMUI, - TASK_MANAGER_SHOW_USER_VISIBLE_JOBS, DEFAULT_TASK_MANAGER_SHOW_USER_VISIBLE_JOBS) + showUserVisibleJobs = + deviceConfigProxy.getBoolean( + NAMESPACE_SYSTEMUI, + TASK_MANAGER_SHOW_USER_VISIBLE_JOBS, + DEFAULT_TASK_MANAGER_SHOW_USER_VISIBLE_JOBS, + ) - informJobSchedulerOfPendingAppStop = deviceConfigProxy.getBoolean( - NAMESPACE_SYSTEMUI, - TASK_MANAGER_INFORM_JOB_SCHEDULER_OF_PENDING_APP_STOP, - DEFAULT_TASK_MANAGER_INFORM_JOB_SCHEDULER_OF_PENDING_APP_STOP) + informJobSchedulerOfPendingAppStop = + deviceConfigProxy.getBoolean( + NAMESPACE_SYSTEMUI, + TASK_MANAGER_INFORM_JOB_SCHEDULER_OF_PENDING_APP_STOP, + DEFAULT_TASK_MANAGER_INFORM_JOB_SCHEDULER_OF_PENDING_APP_STOP, + ) try { activityManager.registerForegroundServiceObserver(foregroundServiceObserver) @@ -267,31 +270,39 @@ class FgsManagerControllerImpl @Inject constructor( deviceConfigProxy.addOnPropertiesChangedListener( NAMESPACE_SYSTEMUI, - backgroundExecutor + backgroundExecutor, ) { _showFooterDot.value = it.getBoolean(TASK_MANAGER_SHOW_FOOTER_DOT, _showFooterDot.value) - showStopBtnForUserAllowlistedApps = it.getBoolean( - TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS, - showStopBtnForUserAllowlistedApps) + showStopBtnForUserAllowlistedApps = + it.getBoolean( + TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS, + showStopBtnForUserAllowlistedApps, + ) var wasShowingUserVisibleJobs = showUserVisibleJobs - showUserVisibleJobs = it.getBoolean( - TASK_MANAGER_SHOW_USER_VISIBLE_JOBS, showUserVisibleJobs) + showUserVisibleJobs = + it.getBoolean(TASK_MANAGER_SHOW_USER_VISIBLE_JOBS, showUserVisibleJobs) if (showUserVisibleJobs != wasShowingUserVisibleJobs) { onShowUserVisibleJobsFlagChanged() } - informJobSchedulerOfPendingAppStop = it.getBoolean( - TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS, - informJobSchedulerOfPendingAppStop) + informJobSchedulerOfPendingAppStop = + it.getBoolean( + TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS, + informJobSchedulerOfPendingAppStop, + ) } - _showFooterDot.value = deviceConfigProxy.getBoolean( - NAMESPACE_SYSTEMUI, - TASK_MANAGER_SHOW_FOOTER_DOT, DEFAULT_TASK_MANAGER_SHOW_FOOTER_DOT - ) - showStopBtnForUserAllowlistedApps = deviceConfigProxy.getBoolean( - NAMESPACE_SYSTEMUI, - TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS, - DEFAULT_TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS) + _showFooterDot.value = + deviceConfigProxy.getBoolean( + NAMESPACE_SYSTEMUI, + TASK_MANAGER_SHOW_FOOTER_DOT, + DEFAULT_TASK_MANAGER_SHOW_FOOTER_DOT, + ) + showStopBtnForUserAllowlistedApps = + deviceConfigProxy.getBoolean( + NAMESPACE_SYSTEMUI, + TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS, + DEFAULT_TASK_MANAGER_SHOW_STOP_BUTTON_FOR_USER_ALLOWLISTED_APPS, + ) dumpManager.registerDumpable(this) @@ -305,7 +316,7 @@ class FgsManagerControllerImpl @Inject constructor( }, IntentFilter(Intent.ACTION_SHOW_FOREGROUND_SERVICE_MANAGER), executor = mainExecutor, - flags = Context.RECEIVER_NOT_EXPORTED + flags = Context.RECEIVER_NOT_EXPORTED, ) initialized = true @@ -323,33 +334,25 @@ class FgsManagerControllerImpl @Inject constructor( override fun addOnNumberOfPackagesChangedListener( listener: FgsManagerController.OnNumberOfPackagesChangedListener ) { - synchronized(lock) { - onNumberOfPackagesChangedListeners.add(listener) - } + synchronized(lock) { onNumberOfPackagesChangedListeners.add(listener) } } override fun removeOnNumberOfPackagesChangedListener( listener: FgsManagerController.OnNumberOfPackagesChangedListener ) { - synchronized(lock) { - onNumberOfPackagesChangedListeners.remove(listener) - } + synchronized(lock) { onNumberOfPackagesChangedListeners.remove(listener) } } override fun addOnDialogDismissedListener( listener: FgsManagerController.OnDialogDismissedListener ) { - synchronized(lock) { - onDialogDismissedListeners.add(listener) - } + synchronized(lock) { onDialogDismissedListeners.add(listener) } } override fun removeOnDialogDismissedListener( listener: FgsManagerController.OnDialogDismissedListener ) { - synchronized(lock) { - onDialogDismissedListeners.remove(listener) - } + synchronized(lock) { onDialogDismissedListeners.remove(listener) } } private fun getNumVisiblePackagesLocked(): Int { @@ -364,9 +367,7 @@ class FgsManagerControllerImpl @Inject constructor( lastNumberOfVisiblePackages = num newChangesSinceDialogWasDismissed = true onNumberOfPackagesChangedListeners.forEach { - backgroundExecutor.execute { - it.onNumberOfPackagesChanged(num) - } + backgroundExecutor.execute { it.onNumberOfPackagesChanged(num) } } } } @@ -396,8 +397,10 @@ class FgsManagerControllerImpl @Inject constructor( recyclerView.layoutManager = LinearLayoutManager(dialogContext) recyclerView.adapter = appListAdapter - val topSpacing = dialogContext.resources - .getDimensionPixelSize(R.dimen.fgs_manager_list_top_spacing) + val topSpacing = + dialogContext.resources.getDimensionPixelSize( + R.dimen.fgs_manager_list_top_spacing + ) dialog.setView(recyclerView, 0, topSpacing, 0, 0) this.dialog = dialog @@ -436,9 +439,7 @@ class FgsManagerControllerImpl @Inject constructor( @GuardedBy("lock") private fun updateAppItemsLocked(refreshUiControls: Boolean = false) { if (dialog == null) { - backgroundExecutor.execute { - clearRunningApps() - } + backgroundExecutor.execute { clearRunningApps() } return } @@ -449,59 +450,61 @@ class FgsManagerControllerImpl @Inject constructor( } } - /** - * Must be called on the background thread. - */ + /** Must be called on the background thread. */ @WorkerThread private fun updateAppItems( packages: Map<UserPackage, Long>, profileIds: Set<Int>, - refreshUiControls: Boolean = true + refreshUiControls: Boolean = true, ) { if (refreshUiControls) { - packages.forEach { (pkg, _) -> - pkg.updateUiControl() - } + packages.forEach { (pkg, _) -> pkg.updateUiControl() } } - val addedPackages = packages.keys.filter { - profileIds.contains(it.userId) && - it.uiControl != UIControl.HIDE_ENTRY && runningApps[it]?.stopped != true - } + val addedPackages = + packages.keys.filter { + profileIds.contains(it.userId) && + it.uiControl != UIControl.HIDE_ENTRY && + runningApps[it]?.stopped != true + } val removedPackages = runningApps.keys.filter { it !in packages } addedPackages.forEach { val ai = packageManager.getApplicationInfoAsUser(it.packageName, 0, it.userId) - runningApps[it] = RunningApp( - it.userId, it.packageName, - packages[it]!!, it.uiControl, - packageManager.getApplicationLabel(ai), - packageManager.getUserBadgedIcon( - packageManager.getApplicationIcon(ai), UserHandle.of(it.userId) + runningApps[it] = + RunningApp( + it.userId, + it.packageName, + packages[it]!!, + it.uiControl, + packageManager.getApplicationLabel(ai), + packageManager.getUserBadgedIcon( + packageManager.getApplicationIcon(ai), + UserHandle.of(it.userId), + ), ) - ) logEvent(stopped = false, it.packageName, it.userId, runningApps[it]!!.timeStarted) } removedPackages.forEach { pkg -> val ra = runningApps[pkg]!! - val ra2 = ra.copy().also { - it.stopped = true - it.appLabel = ra.appLabel - it.icon = ra.icon - } + val ra2 = + ra.copy().also { + it.stopped = true + it.appLabel = ra.appLabel + it.icon = ra.icon + } runningApps[pkg] = ra2 } mainExecutor.execute { - appListAdapter - .setData(runningApps.values.toList().sortedByDescending { it.timeStarted }) + appListAdapter.setData( + runningApps.values.toList().sortedByDescending { it.timeStarted } + ) } } - /** - * Must be called on the background thread. - */ + /** Must be called on the background thread. */ @WorkerThread private fun clearRunningApps() { runningApps.clear() @@ -545,16 +548,19 @@ class FgsManagerControllerImpl @Inject constructor( private fun logEvent(stopped: Boolean, packageName: String, userId: Int, timeStarted: Long) { val timeLogged = systemClock.elapsedRealtime() - val event = if (stopped) { - SysUiStatsLog.TASK_MANAGER_EVENT_REPORTED__EVENT__STOPPED - } else { - SysUiStatsLog.TASK_MANAGER_EVENT_REPORTED__EVENT__VIEWED - } + val event = + if (stopped) { + SysUiStatsLog.TASK_MANAGER_EVENT_REPORTED__EVENT__STOPPED + } else { + SysUiStatsLog.TASK_MANAGER_EVENT_REPORTED__EVENT__VIEWED + } backgroundExecutor.execute { val uid = packageManager.getPackageUidAsUser(packageName, userId) SysUiStatsLog.write( - SysUiStatsLog.TASK_MANAGER_EVENT_REPORTED, uid, event, - timeLogged - timeStarted + SysUiStatsLog.TASK_MANAGER_EVENT_REPORTED, + uid, + event, + timeLogged - timeStarted, ) } } @@ -562,8 +568,7 @@ class FgsManagerControllerImpl @Inject constructor( private inner class AppListAdapter : RecyclerView.Adapter<AppItemViewHolder>() { private val lock = Any() - @GuardedBy("lock") - private var data: List<RunningApp> = listOf() + @GuardedBy("lock") private var data: List<RunningApp> = listOf() override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AppItemViewHolder { return AppItemViewHolder( @@ -574,16 +579,15 @@ class FgsManagerControllerImpl @Inject constructor( override fun onBindViewHolder(holder: AppItemViewHolder, position: Int) { var runningApp: RunningApp - synchronized(lock) { - runningApp = data[position] - } + synchronized(lock) { runningApp = data[position] } with(holder) { iconView.setImageDrawable(runningApp.icon) appLabelView.text = runningApp.appLabel - durationView.text = DateUtils.formatDuration( - max(systemClock.elapsedRealtime() - runningApp.timeStarted, 60000), - DateUtils.LENGTH_MEDIUM - ) + durationView.text = + DateUtils.formatDuration( + max(systemClock.elapsedRealtime() - runningApp.timeStarted, 60000), + DateUtils.LENGTH_MEDIUM, + ) stopButton.setOnClickListener { stopButton.setText(R.string.fgs_manager_app_item_stop_button_stopped_label) stopPackage(runningApp.userId, runningApp.packageName, runningApp.timeStarted) @@ -611,46 +615,54 @@ class FgsManagerControllerImpl @Inject constructor( var oldData = data data = newData - DiffUtil.calculateDiff(object : DiffUtil.Callback() { - override fun getOldListSize(): Int { - return oldData.size - } + DiffUtil.calculateDiff( + object : DiffUtil.Callback() { + override fun getOldListSize(): Int { + return oldData.size + } - override fun getNewListSize(): Int { - return newData.size - } + override fun getNewListSize(): Int { + return newData.size + } - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { - return oldData[oldItemPosition] == newData[newItemPosition] - } + override fun areItemsTheSame( + oldItemPosition: Int, + newItemPosition: Int, + ): Boolean { + return oldData[oldItemPosition] == newData[newItemPosition] + } - override fun areContentsTheSame( - oldItemPosition: Int, - newItemPosition: Int - ): Boolean { - return oldData[oldItemPosition].stopped == newData[newItemPosition].stopped - } - }).dispatchUpdatesTo(this) + override fun areContentsTheSame( + oldItemPosition: Int, + newItemPosition: Int, + ): Boolean { + return oldData[oldItemPosition].stopped == + newData[newItemPosition].stopped + } + } + ) + .dispatchUpdatesTo(this) } } private inner class ForegroundServiceObserver : IForegroundServiceObserver.Stub() { override fun onForegroundStateChanged( - token: IBinder, - packageName: String, - userId: Int, - isForeground: Boolean + token: IBinder, + packageName: String, + userId: Int, + isForeground: Boolean, ) { synchronized(lock) { val userPackageKey = UserPackage(userId, packageName) if (isForeground) { runningTaskIdentifiers - .getOrPut(userPackageKey) { StartTimeAndIdentifiers(systemClock) } - .addFgsToken(token) + .getOrPut(userPackageKey) { StartTimeAndIdentifiers(systemClock) } + .addFgsToken(token) } else { - if (runningTaskIdentifiers[userPackageKey]?.also { - it.removeFgsToken(token) - }?.isEmpty() == true + if ( + runningTaskIdentifiers[userPackageKey] + ?.also { it.removeFgsToken(token) } + ?.isEmpty() == true ) { runningTaskIdentifiers.remove(userPackageKey) } @@ -665,20 +677,24 @@ class FgsManagerControllerImpl @Inject constructor( private inner class UserVisibleJobObserver : IUserVisibleJobObserver.Stub() { override fun onUserVisibleJobStateChanged( - summary: UserVisibleJobSummary, - isRunning: Boolean + summary: UserVisibleJobSummary, + isRunning: Boolean, ) { synchronized(lock) { - val userPackageKey = UserPackage( - UserHandle.getUserId(summary.callingUid), summary.callingPackageName) + val userPackageKey = + UserPackage( + UserHandle.getUserId(summary.callingUid), + summary.callingPackageName, + ) if (isRunning) { runningTaskIdentifiers - .getOrPut(userPackageKey) { StartTimeAndIdentifiers(systemClock) } - .addJobSummary(summary) + .getOrPut(userPackageKey) { StartTimeAndIdentifiers(systemClock) } + .addJobSummary(summary) } else { - if (runningTaskIdentifiers[userPackageKey]?.also { - it.removeJobSummary(summary) - }?.isEmpty() == true + if ( + runningTaskIdentifiers[userPackageKey] + ?.also { it.removeJobSummary(summary) } + ?.isEmpty() == true ) { runningTaskIdentifiers.remove(userPackageKey) } @@ -691,10 +707,7 @@ class FgsManagerControllerImpl @Inject constructor( } } - private inner class UserPackage( - val userId: Int, - val packageName: String - ) { + private inner class UserPackage(val userId: Int, val packageName: String) { val uid by lazy { packageManager.getPackageUidAsUser(packageName, userId) } var backgroundRestrictionExemptionReason = PowerExemptionManager.REASON_DENIED @@ -711,30 +724,31 @@ class FgsManagerControllerImpl @Inject constructor( fun updateUiControl() { backgroundRestrictionExemptionReason = activityManager.getBackgroundRestrictionExemptionReason(uid) - uiControl = when (backgroundRestrictionExemptionReason) { - PowerExemptionManager.REASON_SYSTEM_UID, - PowerExemptionManager.REASON_DEVICE_DEMO_MODE -> UIControl.HIDE_ENTRY - - PowerExemptionManager.REASON_SYSTEM_ALLOW_LISTED, - PowerExemptionManager.REASON_DEVICE_OWNER, - PowerExemptionManager.REASON_DISALLOW_APPS_CONTROL, - PowerExemptionManager.REASON_DPO_PROTECTED_APP, - PowerExemptionManager.REASON_PROFILE_OWNER, - PowerExemptionManager.REASON_ACTIVE_DEVICE_ADMIN, - PowerExemptionManager.REASON_PROC_STATE_PERSISTENT, - PowerExemptionManager.REASON_PROC_STATE_PERSISTENT_UI, - PowerExemptionManager.REASON_ROLE_DIALER, - PowerExemptionManager.REASON_SYSTEM_MODULE, - PowerExemptionManager.REASON_SYSTEM_EXEMPT_APP_OP -> UIControl.HIDE_BUTTON - - PowerExemptionManager.REASON_ALLOWLISTED_PACKAGE -> - if (showStopBtnForUserAllowlistedApps) { - UIControl.NORMAL - } else { - UIControl.HIDE_BUTTON - } - else -> UIControl.NORMAL - } + uiControl = + when (backgroundRestrictionExemptionReason) { + PowerExemptionManager.REASON_SYSTEM_UID, + PowerExemptionManager.REASON_DEVICE_DEMO_MODE -> UIControl.HIDE_ENTRY + + PowerExemptionManager.REASON_SYSTEM_ALLOW_LISTED, + PowerExemptionManager.REASON_DEVICE_OWNER, + PowerExemptionManager.REASON_DISALLOW_APPS_CONTROL, + PowerExemptionManager.REASON_DPO_PROTECTED_APP, + PowerExemptionManager.REASON_PROFILE_OWNER, + PowerExemptionManager.REASON_ACTIVE_DEVICE_ADMIN, + PowerExemptionManager.REASON_PROC_STATE_PERSISTENT, + PowerExemptionManager.REASON_PROC_STATE_PERSISTENT_UI, + PowerExemptionManager.REASON_ROLE_DIALER, + PowerExemptionManager.REASON_SYSTEM_MODULE, + PowerExemptionManager.REASON_SYSTEM_EXEMPT_APP_OP -> UIControl.HIDE_BUTTON + + PowerExemptionManager.REASON_ALLOWLISTED_PACKAGE -> + if (showStopBtnForUserAllowlistedApps) { + UIControl.NORMAL + } else { + UIControl.HIDE_BUTTON + } + else -> UIControl.NORMAL + } // If the app wants to be a good citizen by being stoppable, even if the category it // belongs to is exempted for background restriction, let it be stoppable by user. if (Flags.stoppableFgsSystemApp()) { @@ -747,8 +761,7 @@ class FgsManagerControllerImpl @Inject constructor( } fun isStoppableApp(packageName: String): Boolean { - return stoppableApps.contains(packageName) || - vendorStoppableApps.contains(packageName) + return stoppableApps.contains(packageName) || vendorStoppableApps.contains(packageName) } override fun equals(other: Any?): Boolean { @@ -771,9 +784,7 @@ class FgsManagerControllerImpl @Inject constructor( } } - private data class StartTimeAndIdentifiers( - val systemClock: SystemClock - ) { + private data class StartTimeAndIdentifiers(val systemClock: SystemClock) { val startTime = systemClock.elapsedRealtime() val fgsTokens = mutableSetOf<IBinder>() val jobSummaries = mutableSetOf<UserVisibleJobSummary>() @@ -846,7 +857,7 @@ class FgsManagerControllerImpl @Inject constructor( val userId: Int, val packageName: String, val timeStarted: Long, - val uiControl: UIControl + val uiControl: UIControl, ) { constructor( userId: Int, @@ -854,7 +865,7 @@ class FgsManagerControllerImpl @Inject constructor( timeStarted: Long, uiControl: UIControl, appLabel: CharSequence, - icon: Drawable + icon: Drawable, ) : this(userId, packageName, timeStarted, uiControl) { this.appLabel = appLabel this.icon = icon @@ -884,7 +895,9 @@ class FgsManagerControllerImpl @Inject constructor( } private enum class UIControl { - NORMAL, HIDE_BUTTON, HIDE_ENTRY + NORMAL, + HIDE_BUTTON, + HIDE_ENTRY, } override fun dump(printwriter: PrintWriter, args: Array<out String>) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileRevealController.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileRevealController.java index 5da480968b89..cb3fc071ac82 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileRevealController.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileRevealController.java @@ -10,6 +10,7 @@ import com.android.systemui.Prefs; import com.android.systemui.plugins.qs.QSTile; import com.android.systemui.qs.customize.QSCustomizerController; import com.android.systemui.qs.dagger.QSScope; +import com.android.systemui.shade.ShadeDisplayAware; import java.util.Collection; import java.util.Collections; @@ -96,7 +97,7 @@ public class QSTileRevealController { private final QSCustomizerController mQsCustomizerController; @Inject - Factory(Context context, QSCustomizerController qsCustomizerController) { + Factory(@ShadeDisplayAware Context context, QSCustomizerController qsCustomizerController) { mContext = context; mQsCustomizerController = qsCustomizerController; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTileStatePersister.kt b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTileStatePersister.kt index 6f5dea32bd83..379b606dc49e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTileStatePersister.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTileStatePersister.kt @@ -22,12 +22,14 @@ import android.content.SharedPreferences import android.service.quicksettings.Tile import android.util.Log import com.android.internal.annotations.VisibleForTesting +import com.android.systemui.dagger.qualifiers.Application import javax.inject.Inject import org.json.JSONException import org.json.JSONObject data class TileServiceKey(val componentName: ComponentName, val user: Int) { private val string = "${componentName.flattenToString()}:$user" + override fun toString() = string } @@ -56,12 +58,14 @@ interface CustomTileStatePersister { * Any fields that have not been saved will be set to `null` */ fun readState(key: TileServiceKey): Tile? + /** * Persists the state into [SharedPreferences]. * * The implementation does not store fields that are `null` or icons. */ fun persistState(key: TileServiceKey, tile: Tile) + /** * Removes the state for a given tile, user pair. * @@ -71,7 +75,7 @@ interface CustomTileStatePersister { } // TODO(b/299909989) Merge this class into into CustomTileRepository -class CustomTileStatePersisterImpl @Inject constructor(context: Context) : +class CustomTileStatePersisterImpl @Inject constructor(@Application context: Context) : CustomTileStatePersister { companion object { private const val FILE_NAME = "custom_tiles_state" diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/PackageManagerAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/external/PackageManagerAdapter.java index 28e4fd0ef51c..6fb4455fecce 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/PackageManagerAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/PackageManagerAdapter.java @@ -28,6 +28,8 @@ import android.os.RemoteException; import androidx.annotation.Nullable; +import com.android.systemui.dagger.qualifiers.Application; + import javax.inject.Inject; // Adapter that wraps calls to PackageManager or IPackageManager for {@link TileLifecycleManager}. @@ -42,7 +44,7 @@ public class PackageManagerAdapter { // Uses the PackageManager for the provided context. // When necessary, uses the IPackagemanger in AppGlobals. @Inject - public PackageManagerAdapter(Context context) { + public PackageManagerAdapter(@Application Context context) { mPackageManager = context.getPackageManager(); mIPackageManager = AppGlobals.getPackageManager(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileData.kt b/packages/SystemUI/src/com/android/systemui/qs/external/TileData.kt new file mode 100644 index 000000000000..de759687e012 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileData.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external + +import android.graphics.drawable.Icon +import androidx.compose.runtime.Immutable + +/** + * Data bundle of information to show the user when requesting to add a TileService + * + * @property appName Name of the app requesting their [TileService] to be added. + * @property label Label of the tile. + * @property icon Icon for the tile. + */ +@Immutable +data class TileData( + val callingUid: Int, + val appName: CharSequence, + val label: CharSequence, + val icon: Icon?, + val packageName: String, +) diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileRequestDialog.kt b/packages/SystemUI/src/com/android/systemui/qs/external/TileRequestDialog.kt index c3c587de5a24..5597f288e122 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileRequestDialog.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileRequestDialog.kt @@ -18,73 +18,73 @@ package com.android.systemui.qs.external import android.app.IUriGrantsManager import android.content.Context -import android.graphics.drawable.Icon import android.view.ContextThemeWrapper import android.view.LayoutInflater import android.view.ViewGroup import android.widget.TextView -import com.android.systemui.res.R import com.android.systemui.plugins.qs.QSTile import com.android.systemui.plugins.qs.QSTileView import com.android.systemui.qs.tileimpl.QSTileImpl import com.android.systemui.qs.tileimpl.QSTileImpl.ResourceIcon import com.android.systemui.qs.tileimpl.QSTileViewImpl +import com.android.systemui.res.R import com.android.systemui.statusbar.phone.SystemUIDialog -/** - * Dialog to present to the user to ask for authorization to add a [TileService]. - */ -class TileRequestDialog( - context: Context, -) : SystemUIDialog(context) { +/** Dialog to present to the user to ask for authorization to add a [TileService]. */ +class TileRequestDialog(context: Context) : SystemUIDialog(context) { companion object { internal val CONTENT_ID = R.id.content } - /** - * Set the data of the tile to add, to show the user. - */ + /** Set the data of the tile to add, to show the user. */ fun setTileData(tileData: TileData, iUriGrantsManager: IUriGrantsManager) { - val ll = (LayoutInflater - .from(context) - .inflate(R.layout.tile_service_request_dialog, null) - as ViewGroup).apply { + val ll = + (LayoutInflater.from(context).inflate(R.layout.tile_service_request_dialog, null) + as ViewGroup) + .apply { requireViewById<TextView>(R.id.text).apply { - text = context - .getString(R.string.qs_tile_request_dialog_text, tileData.appName) + text = + context.getString( + R.string.qs_tile_request_dialog_text, + tileData.appName, + ) } addView( - createTileView(tileData, iUriGrantsManager), - context.resources.getDimensionPixelSize( - R.dimen.qs_tile_service_request_tile_width), - context.resources.getDimensionPixelSize(R.dimen.qs_quick_tile_size) + createTileView(tileData, iUriGrantsManager), + context.resources.getDimensionPixelSize( + R.dimen.qs_tile_service_request_tile_width + ), + context.resources.getDimensionPixelSize(R.dimen.qs_quick_tile_size), ) isSelected = true - } + } val spacing = 0 setView(ll, spacing, spacing, spacing, spacing / 2) } private fun createTileView( - tileData: TileData, - iUriGrantsManager: IUriGrantsManager, + tileData: TileData, + iUriGrantsManager: IUriGrantsManager, ): QSTileView { val themedContext = ContextThemeWrapper(context, R.style.Theme_SystemUI_QuickSettings) val tile = QSTileViewImpl(themedContext, true) - val state = QSTile.BooleanState().apply { - label = tileData.label - handlesLongClick = false - icon = tileData.icon?.loadDrawableCheckingUriGrant( - context, - iUriGrantsManager, - tileData.callingUid, - tileData.packageName, - )?.let { - QSTileImpl.DrawableIcon(it) - } ?: ResourceIcon.get(R.drawable.android) - contentDescription = label - } + val state = + QSTile.BooleanState().apply { + label = tileData.label + handlesLongClick = false + icon = + tileData.icon + ?.loadDrawableCheckingUriGrant( + context, + iUriGrantsManager, + tileData.callingUid, + tileData.packageName, + ) + ?.let { QSTileImpl.DrawableIcon(it) } + ?: ResourceIcon.get(R.drawable.android) + contentDescription = label + } tile.onStateChanged(state) tile.post { tile.stateDescription = "" @@ -93,19 +93,4 @@ class TileRequestDialog( } return tile } - - /** - * Data bundle of information to show the user. - * - * @property appName Name of the app requesting their [TileService] to be added. - * @property label Label of the tile. - * @property icon Icon for the tile. - */ - data class TileData( - val callingUid: Int, - val appName: CharSequence, - val label: CharSequence, - val icon: Icon?, - val packageName: String, - ) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceRequestController.kt b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceRequestController.kt index 08567afd729e..33e059074a81 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceRequestController.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceRequestController.kt @@ -26,9 +26,11 @@ import android.os.RemoteException import android.util.Log import androidx.annotation.VisibleForTesting import com.android.internal.statusbar.IAddTileResultCallback -import com.android.systemui.res.R import com.android.systemui.dagger.SysUISingleton import com.android.systemui.qs.QSHost +import com.android.systemui.qs.external.ui.dialog.TileRequestDialogComposeDelegate +import com.android.systemui.qs.flags.QsInCompose +import com.android.systemui.res.R import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.commandline.Command import com.android.systemui.statusbar.commandline.CommandRegistry @@ -40,50 +42,50 @@ import javax.inject.Inject private const val TAG = "TileServiceRequestController" -/** - * Controller to interface between [TileRequestDialog] and [QSHost]. - */ +/** Controller to interface between [TileRequestDialog] and [QSHost]. */ class TileServiceRequestController( - private val qsHost: QSHost, - private val commandQueue: CommandQueue, - private val commandRegistry: CommandRegistry, - private val eventLogger: TileRequestDialogEventLogger, - private val iUriGrantsManager: IUriGrantsManager, - private val dialogCreator: () -> TileRequestDialog = { TileRequestDialog(qsHost.context) } + private val qsHost: QSHost, + private val commandQueue: CommandQueue, + private val commandRegistry: CommandRegistry, + private val eventLogger: TileRequestDialogEventLogger, + private val iUriGrantsManager: IUriGrantsManager, + private val tileRequestDialogComposeDelegateFactory: TileRequestDialogComposeDelegate.Factory, + private val dialogCreator: () -> TileRequestDialog = { TileRequestDialog(qsHost.context) }, ) { companion object { - internal const val ADD_TILE = StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ADDED - internal const val DONT_ADD_TILE = StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_NOT_ADDED - internal const val TILE_ALREADY_ADDED = - StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ALREADY_ADDED - internal const val DISMISSED = StatusBarManager.TILE_ADD_REQUEST_RESULT_DIALOG_DISMISSED + const val ADD_TILE = StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ADDED + const val DONT_ADD_TILE = StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_NOT_ADDED + const val TILE_ALREADY_ADDED = + StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ALREADY_ADDED + const val DISMISSED = StatusBarManager.TILE_ADD_REQUEST_RESULT_DIALOG_DISMISSED } private var dialogCanceller: ((String) -> Unit)? = null - private val commandQueueCallback = object : CommandQueue.Callbacks { - override fun requestAddTile( - callingUid: Int, - componentName: ComponentName, - appName: CharSequence, - label: CharSequence, - icon: Icon, - callback: IAddTileResultCallback - ) { - requestTileAdd(callingUid, componentName, appName, label, icon) { - try { - callback.onTileRequest(it) - } catch (e: RemoteException) { - Log.e(TAG, "Couldn't respond to request", e) + private val commandQueueCallback = + object : CommandQueue.Callbacks { + override fun requestAddTile( + callingUid: Int, + componentName: ComponentName, + appName: CharSequence, + label: CharSequence, + icon: Icon, + callback: IAddTileResultCallback, + ) { + requestTileAdd(callingUid, componentName, appName, label, icon) { + try { + callback.onTileRequest(it) + } catch (e: RemoteException) { + Log.e(TAG, "Couldn't respond to request", e) + } } } - } - override fun cancelRequestAddTile(packageName: String) { - dialogCanceller?.invoke(packageName) + override fun cancelRequestAddTile(packageName: String) { + dialogCanceller?.invoke(packageName) + } } - } fun init() { commandRegistry.registerCommand("tile-service-add") { TileServiceRequestCommand() } @@ -100,58 +102,87 @@ class TileServiceRequestController( } @VisibleForTesting - internal fun requestTileAdd( + fun requestTileAdd( callingUid: Int, componentName: ComponentName, appName: CharSequence, label: CharSequence, icon: Icon?, - callback: Consumer<Int> - ) { + callback: Consumer<Int>, + ): SystemUIDialog? { val instanceId = eventLogger.newInstanceId() val packageName = componentName.packageName if (isTileAlreadyAdded(componentName)) { callback.accept(TILE_ALREADY_ADDED) eventLogger.logTileAlreadyAdded(packageName, instanceId) - return + return null } - val dialogResponse = SingleShotConsumer<Int> { response -> - if (response == ADD_TILE) { - addTile(componentName) - } - dialogCanceller = null - eventLogger.logUserResponse(response, packageName, instanceId) - callback.accept(response) - } - val tileData = TileRequestDialog.TileData( - callingUid, - appName, - label, - icon, - componentName.packageName, - ) - createDialog(tileData, dialogResponse).also { dialog -> - dialogCanceller = { - if (packageName == it) { - dialog.cancel() + val dialogResponse = + SingleShotConsumer<Int> { response -> + if (response == ADD_TILE) { + addTile(componentName) } dialogCanceller = null + eventLogger.logUserResponse(response, packageName, instanceId) + callback.accept(response) + } + val tileData = TileData(callingUid, appName, label, icon, componentName.packageName) + return if (QsInCompose.isEnabled) { + createComposeDialog(tileData, dialogResponse) + } else { + createDialog(tileData, dialogResponse) + } + .also { dialog -> + dialogCanceller = { + if (packageName == it) { + dialog.cancel() + } + dialogCanceller = null + } + dialog.show() + eventLogger.logDialogShown(packageName, instanceId) + } + } + + private fun createComposeDialog( + tileData: TileData, + responseHandler: SingleShotConsumer<Int>, + ): SystemUIDialog { + val dialogClickListener = + DialogInterface.OnClickListener { _, which -> + if (which == Dialog.BUTTON_POSITIVE) { + responseHandler.accept(ADD_TILE) + } else { + responseHandler.accept(DONT_ADD_TILE) + } + } + return tileRequestDialogComposeDelegateFactory + .create(dialogListener = dialogClickListener, tiledata = tileData) + .createDialog() + .apply { + setShowForAllUsers(true) + setCanceledOnTouchOutside(true) + setOnCancelListener { responseHandler.accept(DISMISSED) } + // We want this in case the dialog is dismissed without it being cancelled (for + // example + // by going home or locking the device). We use a SingleShotConsumer so the response + // is only sent once, with the first value. + setOnDismissListener { responseHandler.accept(DISMISSED) } } - }.show() - eventLogger.logDialogShown(packageName, instanceId) } private fun createDialog( - tileData: TileRequestDialog.TileData, - responseHandler: SingleShotConsumer<Int> + tileData: TileData, + responseHandler: SingleShotConsumer<Int>, ): SystemUIDialog { - val dialogClickListener = DialogInterface.OnClickListener { _, which -> - if (which == Dialog.BUTTON_POSITIVE) { - responseHandler.accept(ADD_TILE) - } else { - responseHandler.accept(DONT_ADD_TILE) + val dialogClickListener = + DialogInterface.OnClickListener { _, which -> + if (which == Dialog.BUTTON_POSITIVE) { + responseHandler.accept(ADD_TILE) + } else { + responseHandler.accept(DONT_ADD_TILE) + } } - } return dialogCreator().apply { setTileData(tileData, iUriGrantsManager) setShowForAllUsers(true) @@ -173,19 +204,20 @@ class TileServiceRequestController( inner class TileServiceRequestCommand : Command { override fun execute(pw: PrintWriter, args: List<String>) { - val componentName: ComponentName = ComponentName.unflattenFromString(args[0]) + val componentName: ComponentName = + ComponentName.unflattenFromString(args[0]) ?: run { Log.w(TAG, "Malformed componentName ${args[0]}") return } - requestTileAdd(0, componentName, args[1], args[2], null) { - Log.d(TAG, "Response: $it") - } + requestTileAdd(0, componentName, args[1], args[2], null) { Log.d(TAG, "Response: $it") } } override fun help(pw: PrintWriter) { - pw.println("Usage: adb shell cmd statusbar tile-service-add " + - "<componentName> <appName> <label>") + pw.println( + "Usage: adb shell cmd statusbar tile-service-add " + + "<componentName> <appName> <label>" + ) } } @@ -200,18 +232,23 @@ class TileServiceRequestController( } @SysUISingleton - class Builder @Inject constructor( + class Builder + @Inject + constructor( private val commandQueue: CommandQueue, private val commandRegistry: CommandRegistry, private val iUriGrantsManager: IUriGrantsManager, + private val tileRequestDialogComposeDelegateFactory: + TileRequestDialogComposeDelegate.Factory, ) { fun create(qsHost: QSHost): TileServiceRequestController { return TileServiceRequestController( - qsHost, - commandQueue, - commandRegistry, - TileRequestDialogEventLogger(), - iUriGrantsManager, + qsHost, + commandQueue, + commandRegistry, + TileRequestDialogEventLogger(), + iUriGrantsManager, + tileRequestDialogComposeDelegateFactory, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/ui/dialog/TileRequestDialogComposeDelegate.kt b/packages/SystemUI/src/com/android/systemui/qs/external/ui/dialog/TileRequestDialogComposeDelegate.kt new file mode 100644 index 000000000000..446be9b9ebcb --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/external/ui/dialog/TileRequestDialogComposeDelegate.kt @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external.ui.dialog + +import android.content.DialogInterface.BUTTON_NEGATIVE +import android.content.DialogInterface.BUTTON_POSITIVE +import android.content.DialogInterface.OnClickListener +import androidx.compose.foundation.layout.Arrangement.spacedBy +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.dimensionResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.android.compose.PlatformButton +import com.android.compose.PlatformOutlinedButton +import com.android.compose.theme.PlatformTheme +import com.android.systemui.dialog.ui.composable.AlertDialogContent +import com.android.systemui.lifecycle.rememberViewModel +import com.android.systemui.qs.external.TileData +import com.android.systemui.qs.external.ui.viewmodel.TileRequestDialogViewModel +import com.android.systemui.qs.panels.ui.compose.infinitegrid.LargeStaticTile +import com.android.systemui.res.R +import com.android.systemui.statusbar.phone.SystemUIDialog +import com.android.systemui.statusbar.phone.SystemUIDialogFactory +import com.android.systemui.statusbar.phone.create +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject + +class TileRequestDialogComposeDelegate +@AssistedInject +constructor( + private val sysuiDialogFactory: SystemUIDialogFactory, + private val tileRequestDialogViewModelFactory: TileRequestDialogViewModel.Factory, + @Assisted private val tileData: TileData, + @Assisted private val dialogListener: OnClickListener, +) : SystemUIDialog.Delegate { + + override fun createDialog(): SystemUIDialog { + return sysuiDialogFactory.create { TileRequestDialogContent(it) } + } + + @Composable + private fun TileRequestDialogContent(dialog: SystemUIDialog) { + PlatformTheme { + AlertDialogContent( + title = {}, + content = { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = spacedBy(16.dp), + ) { + val viewModel = + rememberViewModel(traceName = "TileRequestDialog", key = tileData) { + tileRequestDialogViewModelFactory.create(dialog.context, tileData) + } + + Text( + text = + stringResource( + R.string.qs_tile_request_dialog_text, + tileData.appName, + ), + textAlign = TextAlign.Start, + ) + + LargeStaticTile( + uiState = viewModel.uiState, + modifier = + Modifier.width( + dimensionResource( + id = R.dimen.qs_tile_service_request_tile_width + ) + ), + ) + } + }, + positiveButton = { + PlatformButton( + onClick = { + dialogListener.onClick(dialog, BUTTON_POSITIVE) + dialog.dismiss() + } + ) { + Text(stringResource(R.string.qs_tile_request_dialog_add)) + } + }, + negativeButton = { + PlatformOutlinedButton( + onClick = { + dialogListener.onClick(dialog, BUTTON_NEGATIVE) + dialog.dismiss() + } + ) { + Text(stringResource(R.string.qs_tile_request_dialog_not_add)) + } + }, + ) + } + } + + @AssistedFactory + interface Factory { + fun create( + tiledata: TileData, + dialogListener: OnClickListener, + ): TileRequestDialogComposeDelegate + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModel.kt b/packages/SystemUI/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModel.kt new file mode 100644 index 000000000000..c756adc07ba4 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModel.kt @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external.ui.viewmodel + +import android.app.IUriGrantsManager +import android.content.Context +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.android.systemui.dagger.qualifiers.Background +import com.android.systemui.lifecycle.ExclusiveActivatable +import com.android.systemui.plugins.qs.QSTile +import com.android.systemui.qs.external.TileData +import com.android.systemui.qs.panels.ui.viewmodel.toUiState +import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIcon +import com.android.systemui.qs.tileimpl.QSTileImpl.ResourceIcon +import com.android.systemui.res.R +import dagger.assisted.Assisted +import dagger.assisted.AssistedFactory +import dagger.assisted.AssistedInject +import kotlinx.coroutines.CoroutineDispatcher +import kotlinx.coroutines.awaitCancellation +import kotlinx.coroutines.withContext + +class TileRequestDialogViewModel +@AssistedInject +constructor( + private val iUriGrantsManager: IUriGrantsManager, + @Background private val backgroundDispatcher: CoroutineDispatcher, + @Assisted private val dialogContext: Context, + @Assisted private val tileData: TileData, +) : ExclusiveActivatable() { + + private var _icon by mutableStateOf(defaultIcon) + + private val state: QSTile.State + get() = + QSTile.State().apply { + label = tileData.label + handlesLongClick = false + this.icon = _icon + } + + val uiState by derivedStateOf { state.toUiState(dialogContext.resources) } + + override suspend fun onActivated(): Nothing { + withContext(backgroundDispatcher) { + tileData.icon + ?.loadDrawableCheckingUriGrant( + dialogContext, + iUriGrantsManager, + tileData.callingUid, + tileData.packageName, + ) + ?.run { _icon = DrawableIcon(this) } + } + awaitCancellation() + } + + @AssistedFactory + interface Factory { + fun create(dialogContext: Context, tileData: TileData): TileRequestDialogViewModel + } + + companion object { + private val defaultIcon: QSTile.Icon = ResourceIcon.get(R.drawable.android) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt index 58834037e2b7..eeec9b3ef5e6 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/LargeTileSpanRepository.kt @@ -20,8 +20,8 @@ import android.content.res.Resources import com.android.systemui.common.ui.data.repository.ConfigurationRepository import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.kotlin.emitOnStart import javax.inject.Inject import kotlinx.coroutines.CoroutineScope @@ -38,8 +38,8 @@ class LargeTileSpanRepository @Inject constructor( @Application scope: CoroutineScope, - @Main private val resources: Resources, - configurationRepository: ConfigurationRepository, + @ShadeDisplayAware private val resources: Resources, + @ShadeDisplayAware configurationRepository: ConfigurationRepository, ) { val span: StateFlow<Int> = configurationRepository.onConfigurationChange diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/PaginatedGridRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/PaginatedGridRepository.kt index 424be90ba2ec..6746efac4aa3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/PaginatedGridRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/PaginatedGridRepository.kt @@ -19,8 +19,8 @@ package com.android.systemui.qs.panels.data.repository import android.content.res.Resources import com.android.systemui.common.ui.data.repository.ConfigurationRepository import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.kotlin.emitOnStart import javax.inject.Inject import kotlinx.coroutines.flow.map @@ -33,8 +33,8 @@ import kotlinx.coroutines.flow.map class PaginatedGridRepository @Inject constructor( - @Main private val resources: Resources, - configurationRepository: ConfigurationRepository, + @ShadeDisplayAware private val resources: Resources, + @ShadeDisplayAware configurationRepository: ConfigurationRepository, ) { val rows = configurationRepository.onConfigurationChange.emitOnStart().map { diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt index a9205c27216d..693681d090d8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QSColumnsRepository.kt @@ -19,8 +19,8 @@ package com.android.systemui.qs.panels.data.repository import android.content.res.Resources import com.android.systemui.common.ui.data.repository.ConfigurationRepository import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.kotlin.emitOnStart import javax.inject.Inject import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -33,8 +33,8 @@ import kotlinx.coroutines.flow.mapLatest class QSColumnsRepository @Inject constructor( - @Main private val resources: Resources, - configurationRepository: ConfigurationRepository, + @ShadeDisplayAware private val resources: Resources, + @ShadeDisplayAware configurationRepository: ConfigurationRepository, ) { val splitShadeColumns: Flow<Int> = flowOf(resources.getInteger(R.integer.quick_settings_split_shade_num_columns)) diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt index ee0cfb304db0..636f703ac65a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/QuickQuickSettingsRowRepository.kt @@ -19,8 +19,8 @@ package com.android.systemui.qs.panels.data.repository import android.content.res.Resources import com.android.systemui.common.ui.data.repository.ConfigurationRepository import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.kotlin.emitOnStart import javax.inject.Inject import kotlinx.coroutines.flow.map @@ -29,8 +29,8 @@ import kotlinx.coroutines.flow.map class QuickQuickSettingsRowRepository @Inject constructor( - @Main private val resources: Resources, - configurationRepository: ConfigurationRepository, + @ShadeDisplayAware private val resources: Resources, + @ShadeDisplayAware configurationRepository: ConfigurationRepository, ) { val rows = configurationRepository.onConfigurationChange.emitOnStart().map { diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/StockTilesRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/StockTilesRepository.kt index 86a29f91e51c..a2d892c86f4c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/StockTilesRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/data/repository/StockTilesRepository.kt @@ -19,17 +19,15 @@ package com.android.systemui.qs.panels.data.repository import android.content.res.Resources import com.android.server.display.feature.flags.Flags import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject @SysUISingleton class StockTilesRepository @Inject -constructor( - @Main private val resources: Resources, -) { +constructor(@ShadeDisplayAware private val resources: Resources) { /** * List of stock platform tiles. All of the specs will be of type [TileSpec.PlatformTileSpec]. */ diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt index dbad60265645..d72d5f127bba 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/CommonTile.kt @@ -21,7 +21,6 @@ import android.graphics.drawable.AnimatedVectorDrawable import android.graphics.drawable.Drawable import android.text.TextUtils import androidx.compose.animation.animateColorAsState -import androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi import androidx.compose.animation.graphics.res.animatedVectorResource import androidx.compose.animation.graphics.res.rememberAnimatedVectorPainter import androidx.compose.animation.graphics.vector.AnimatedImageVector @@ -192,7 +191,6 @@ fun LargeTileLabels( } } -@OptIn(ExperimentalAnimationGraphicsApi::class) @Composable fun SmallTileContent( modifier: Modifier = Modifier, @@ -229,6 +227,7 @@ fun SmallTileContent( } } } + is Icon.Loaded -> { LaunchedEffect(loadedDrawable) { if (loadedDrawable is AnimatedVectorDrawable) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt index abdf923ebe73..c798e5bb6dc7 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/infinitegrid/Tile.kt @@ -24,6 +24,7 @@ import android.service.quicksettings.Tile.STATE_INACTIVE import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.background import androidx.compose.foundation.combinedClickable import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.layout.Arrangement @@ -263,6 +264,28 @@ fun TileContainer( } @Composable +fun LargeStaticTile(uiState: TileUiState, modifier: Modifier = Modifier) { + val colors = TileDefaults.getColorForState(uiState = uiState, iconOnly = false) + + Box( + modifier + .clip(TileDefaults.animateTileShape(state = uiState.state)) + .background(colors.background) + .height(TileHeight) + .tilePadding() + ) { + LargeTileContent( + label = uiState.label, + secondaryLabel = "", + icon = getTileIcon(icon = uiState.icon), + sideDrawable = null, + colors = colors, + squishiness = { 1f }, + ) + } +} + +@Composable private fun getTileIcon(icon: Supplier<QSTile.Icon?>): Icon { val context = LocalContext.current return icon.get()?.let { diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/DefaultTilesRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/DefaultTilesRepository.kt index fe0a69b03287..d4ac9013cf58 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/DefaultTilesRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/DefaultTilesRepository.kt @@ -2,9 +2,9 @@ package com.android.systemui.qs.pipeline.data.repository import android.content.res.Resources import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.QSHost import com.android.systemui.qs.pipeline.shared.TileSpec +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject interface DefaultTilesRepository { @@ -14,9 +14,7 @@ interface DefaultTilesRepository { @SysUISingleton class DefaultTilesQSHostRepository @Inject -constructor( - @Main private val resources: Resources, -) : DefaultTilesRepository { +constructor(@ShadeDisplayAware private val resources: Resources) : DefaultTilesRepository { override val defaultTiles: List<TileSpec> get() = QSHost.getDefaultSpecs(resources).map(TileSpec::create).filter { diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/MinimumTilesRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/MinimumTilesRepository.kt index 3a005c0ebfed..40720a28ce09 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/MinimumTilesRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/MinimumTilesRepository.kt @@ -18,8 +18,8 @@ package com.android.systemui.qs.pipeline.data.repository import android.content.res.Resources import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** @@ -35,7 +35,7 @@ interface MinimumTilesRepository { * creation, as it's not expected to change. */ @SysUISingleton -class MinimumTilesResourceRepository @Inject constructor(@Main resources: Resources) : +class MinimumTilesResourceRepository @Inject constructor(@ShadeDisplayAware resources: Resources) : MinimumTilesRepository { override val minNumberOfTiles: Int = resources.getInteger(R.integer.quick_settings_min_num_tiles) diff --git a/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/TileSpecRepository.kt b/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/TileSpecRepository.kt index d94e7cfab5f1..c6751b7717e2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/TileSpecRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/pipeline/data/repository/TileSpecRepository.kt @@ -20,12 +20,12 @@ import android.annotation.UserIdInt import android.content.res.Resources import android.util.SparseArray import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.pipeline.data.model.RestoreData import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.qs.pipeline.shared.logging.QSPipelineLogger import com.android.systemui.res.R import com.android.systemui.retail.data.repository.RetailModeRepository +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow @@ -92,7 +92,7 @@ interface TileSpecRepository { class TileSpecSettingsRepository @Inject constructor( - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val logger: QSPipelineLogger, private val retailModeRepository: RetailModeRepository, private val userTileSpecRepositoryFactory: UserTileSpecRepository.Factory, diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java index 9abc494e56e6..464eeda6a0a8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java @@ -31,6 +31,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.annotation.CallSuper; import android.annotation.NonNull; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -68,6 +69,7 @@ import com.android.systemui.qs.QSEvent; import com.android.systemui.qs.QSHost; import com.android.systemui.qs.QsEventLogger; import com.android.systemui.qs.SideLabelTileLayout; +import com.android.systemui.qs.flags.QsInCompose; import com.android.systemui.qs.logging.QSLogger; import java.io.PrintWriter; @@ -535,6 +537,23 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy } } + protected Icon maybeLoadResourceIcon(int id) { + return maybeLoadResourceIcon(id, mContext); + } + + /** + * Returns the {@link QSTile.Icon} for the resource ID, optionally loading the drawable if + * {@link QsInCompose#isEnabled()} is true. + */ + @SuppressLint("UseCompatLoadingForDrawables") + public static Icon maybeLoadResourceIcon(int id, Context context) { + if (QsInCompose.isEnabled()) { + return new DrawableIconWithRes(context.getDrawable(id), id); + } else { + return ResourceIcon.get(id); + } + } + @Override public String getMetricsSpec() { return mTileSpec; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java index 71b69c92b87d..bb818fa5e164 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AirplaneModeTile.java @@ -160,7 +160,7 @@ public class AirplaneModeTile extends QSTileImpl<BooleanState> { final boolean airplaneMode = value != 0; state.value = airplaneMode; state.label = mContext.getString(R.string.airplane_mode); - state.icon = ResourceIcon.get(state.value + state.icon = maybeLoadResourceIcon(state.value ? R.drawable.qs_airplane_icon_on : R.drawable.qs_airplane_icon_off); state.state = airplaneMode ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; state.contentDescription = state.label; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt index 73d991f6efe7..9efdd98df4cb 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AlarmTile.kt @@ -9,6 +9,7 @@ import android.provider.AlarmClock import android.service.quicksettings.Tile import android.text.TextUtils import android.text.format.DateFormat +import android.widget.Button import androidx.annotation.VisibleForTesting import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.MetricsLogger @@ -42,26 +43,28 @@ constructor( activityStarter: ActivityStarter, qsLogger: QSLogger, private val userTracker: UserTracker, - nextAlarmController: NextAlarmController -) : QSTileImpl<QSTile.State>( - host, - uiEventLogger, - backgroundLooper, - mainHandler, - falsingManager, - metricsLogger, - statusBarStateController, - activityStarter, - qsLogger -) { + nextAlarmController: NextAlarmController, +) : + QSTileImpl<QSTile.State>( + host, + uiEventLogger, + backgroundLooper, + mainHandler, + falsingManager, + metricsLogger, + statusBarStateController, + activityStarter, + qsLogger, + ) { private var lastAlarmInfo: AlarmManager.AlarmClockInfo? = null - private val icon = ResourceIcon.get(R.drawable.ic_alarm) + private var icon: QSTile.Icon? = null @VisibleForTesting internal val defaultIntent = Intent(AlarmClock.ACTION_SHOW_ALARMS) - private val callback = NextAlarmController.NextAlarmChangeCallback { nextAlarm -> - lastAlarmInfo = nextAlarm - refreshState() - } + private val callback = + NextAlarmController.NextAlarmChangeCallback { nextAlarm -> + lastAlarmInfo = nextAlarm + refreshState() + } init { nextAlarmController.observe(this, callback) @@ -70,6 +73,7 @@ constructor( override fun newTileState(): QSTile.State { return QSTile.State().apply { handlesLongClick = false + expandedAccessibilityClassName = Button::class.java.name } } @@ -82,21 +86,28 @@ constructor( if (pendingIntent != null) { mActivityStarter.postStartActivityDismissingKeyguard(pendingIntent, animationController) } else { - mActivityStarter.postStartActivityDismissingKeyguard(defaultIntent, 0, - animationController) + mActivityStarter.postStartActivityDismissingKeyguard( + defaultIntent, + 0, + animationController, + ) } } override fun handleUpdateState(state: QSTile.State, arg: Any?) { + if (icon == null) { + icon = maybeLoadResourceIcon(R.drawable.ic_alarm) + } state.icon = icon state.label = tileLabel lastAlarmInfo?.let { state.secondaryLabel = formatNextAlarm(it) state.state = Tile.STATE_ACTIVE - } ?: run { - state.secondaryLabel = mContext.getString(R.string.qs_alarm_tile_no_alarm) - state.state = Tile.STATE_INACTIVE } + ?: run { + state.secondaryLabel = mContext.getString(R.string.qs_alarm_tile_no_alarm) + state.state = Tile.STATE_INACTIVE + } state.contentDescription = TextUtils.concat(state.label, ", ", state.secondaryLabel) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java index 7c0ce4cc75a9..9df4e42d1898 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java @@ -147,9 +147,8 @@ public class BatterySaverTile extends QSTileImpl<BooleanState> implements protected void handleUpdateState(BooleanState state, Object arg) { state.state = mPluggedIn ? Tile.STATE_UNAVAILABLE : mPowerSave ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; - state.icon = ResourceIcon.get(mPowerSave - ? R.drawable.qs_battery_saver_icon_on - : R.drawable.qs_battery_saver_icon_off); + state.icon = maybeLoadResourceIcon(mPowerSave + ? R.drawable.qs_battery_saver_icon_on : R.drawable.qs_battery_saver_icon_off); state.label = mContext.getString(R.string.battery_detail_switch_title); state.secondaryLabel = ""; state.contentDescription = state.label; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java index 7bff827dee03..7eb0aaabb7e1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java @@ -59,13 +59,13 @@ import com.android.systemui.qs.tileimpl.QSTileImpl; import com.android.systemui.res.R; import com.android.systemui.statusbar.policy.BluetoothController; +import kotlinx.coroutines.Job; + import java.util.List; import java.util.concurrent.Executor; import javax.inject.Inject; -import kotlinx.coroutines.Job; - /** Quick settings tile: Bluetooth **/ public class BluetoothTile extends QSTileImpl<BooleanState> { @@ -201,7 +201,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { if (enabled) { if (connected) { - state.icon = ResourceIcon.get(R.drawable.qs_bluetooth_icon_on); + state.icon = maybeLoadResourceIcon(R.drawable.qs_bluetooth_icon_on); if (!TextUtils.isEmpty(mController.getConnectedDeviceName())) { state.label = mController.getConnectedDeviceName(); } @@ -209,17 +209,15 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { mContext.getString(R.string.accessibility_bluetooth_name, state.label) + ", " + state.secondaryLabel; } else if (state.isTransient) { - state.icon = ResourceIcon.get( - R.drawable.qs_bluetooth_icon_search); + state.icon = maybeLoadResourceIcon(R.drawable.qs_bluetooth_icon_search); state.stateDescription = state.secondaryLabel; } else { - state.icon = - ResourceIcon.get(R.drawable.qs_bluetooth_icon_off); + state.icon = maybeLoadResourceIcon(R.drawable.qs_bluetooth_icon_off); state.stateDescription = mContext.getString(R.string.accessibility_not_connected); } state.state = Tile.STATE_ACTIVE; } else { - state.icon = ResourceIcon.get(R.drawable.qs_bluetooth_icon_off); + state.icon = maybeLoadResourceIcon(R.drawable.qs_bluetooth_icon_off); state.state = Tile.STATE_INACTIVE; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java index 8a72e8db7216..30c2adf89e9b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java @@ -24,6 +24,7 @@ import android.annotation.NonNull; import android.app.Dialog; import android.content.Intent; import android.media.MediaRouter.RouteInfo; +import android.media.projection.StopReason; import android.os.Handler; import android.os.Looper; import android.provider.Settings; @@ -183,7 +184,7 @@ public class CastTile extends QSTileImpl<BooleanState> { }); } } else { - mController.stopCasting(activeDevices.get(0)); + mController.stopCasting(activeDevices.get(0), StopReason.STOP_QS_TILE); } } @@ -290,8 +291,8 @@ public class CastTile extends QSTileImpl<BooleanState> { if (connecting && !state.value) { state.secondaryLabel = mContext.getString(R.string.quick_settings_connecting); } - state.icon = ResourceIcon.get(state.value ? R.drawable.ic_cast_connected - : R.drawable.ic_cast); + state.icon = maybeLoadResourceIcon(state.value + ? R.drawable.ic_cast_connected : R.drawable.ic_cast); if (canCastToNetwork() || state.value) { state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; if (!state.value) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorCorrectionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorCorrectionTile.java index 871973dfcb7f..c2e609ddfc3a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorCorrectionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorCorrectionTile.java @@ -50,7 +50,8 @@ public class ColorCorrectionTile extends QSTileImpl<BooleanState> { public static final String TILE_SPEC = "color_correction"; - private final Icon mIcon = ResourceIcon.get(R.drawable.ic_qs_color_correction); + @Nullable + private Icon mIcon = null; private final UserSettingObserver mSetting; @Inject @@ -122,6 +123,9 @@ public class ColorCorrectionTile extends QSTileImpl<BooleanState> { protected void handleUpdateState(BooleanState state, Object arg) { final int value = arg instanceof Integer ? (Integer) arg : mSetting.getValue(); final boolean enabled = value != 0; + if (mIcon == null) { + mIcon = maybeLoadResourceIcon(R.drawable.ic_qs_color_correction); + } state.value = enabled; state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; state.label = mContext.getString(R.string.quick_settings_color_correction_label); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java index 58969107ad22..ce80133e67a2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java @@ -124,7 +124,7 @@ public class ColorInversionTile extends QSTileImpl<BooleanState> { state.value = enabled; state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; state.label = mContext.getString(R.string.quick_settings_inversion_label); - state.icon = ResourceIcon.get(state.value + state.icon = maybeLoadResourceIcon(state.value ? R.drawable.qs_invert_colors_icon_on : R.drawable.qs_invert_colors_icon_off); state.expandedAccessibilityClassName = Switch.class.getName(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java index 7760943476bf..deeef550b33f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DataSaverTile.java @@ -147,7 +147,7 @@ public class DataSaverTile extends QSTileImpl<BooleanState> implements state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; state.label = mContext.getString(R.string.data_saver); state.contentDescription = state.label; - state.icon = ResourceIcon.get(state.value ? R.drawable.qs_data_saver_icon_on + state.icon = maybeLoadResourceIcon(state.value ? R.drawable.qs_data_saver_icon_on : R.drawable.qs_data_saver_icon_off); state.expandedAccessibilityClassName = Switch.class.getName(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt index cc8a73423174..7213f7a60da0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DeviceControlsTile.kt @@ -1,4 +1,3 @@ - /* * Copyright (C) 2021 The Android Open Source Project * @@ -22,10 +21,9 @@ import android.content.Intent import android.os.Handler import android.os.Looper import android.service.quicksettings.Tile -import androidx.annotation.VisibleForTesting +import android.widget.Button import com.android.internal.jank.InteractionJankMonitor import com.android.internal.logging.MetricsLogger -import com.android.systemui.res.R import com.android.systemui.animation.Expandable import com.android.systemui.controls.ControlsServiceInfo import com.android.systemui.controls.dagger.ControlsComponent @@ -43,10 +41,13 @@ import com.android.systemui.qs.QSHost import com.android.systemui.qs.QsEventLogger import com.android.systemui.qs.logging.QSLogger import com.android.systemui.qs.tileimpl.QSTileImpl +import com.android.systemui.res.R import java.util.concurrent.atomic.AtomicBoolean import javax.inject.Inject -class DeviceControlsTile @Inject constructor( +class DeviceControlsTile +@Inject +constructor( host: QSHost, uiEventLogger: QsEventLogger, @Background backgroundLooper: Looper, @@ -56,32 +57,34 @@ class DeviceControlsTile @Inject constructor( statusBarStateController: StatusBarStateController, activityStarter: ActivityStarter, qsLogger: QSLogger, - private val controlsComponent: ControlsComponent -) : QSTileImpl<QSTile.State>( - host, - uiEventLogger, - backgroundLooper, - mainHandler, - falsingManager, - metricsLogger, - statusBarStateController, - activityStarter, - qsLogger -) { + private val controlsComponent: ControlsComponent, +) : + QSTileImpl<QSTile.State>( + host, + uiEventLogger, + backgroundLooper, + mainHandler, + falsingManager, + metricsLogger, + statusBarStateController, + activityStarter, + qsLogger, + ) { private var hasControlsApps = AtomicBoolean(false) - @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) - val icon: QSTile.Icon - get() = ResourceIcon.get(controlsComponent.getTileImageId()) + private var icon: QSTile.Icon? = null - private val listingCallback = object : ControlsListingController.ControlsListingCallback { - override fun onServicesUpdated(serviceInfos: List<ControlsServiceInfo>) { - if (hasControlsApps.compareAndSet(serviceInfos.isEmpty(), serviceInfos.isNotEmpty())) { - refreshState() + private val listingCallback = + object : ControlsListingController.ControlsListingCallback { + override fun onServicesUpdated(serviceInfos: List<ControlsServiceInfo>) { + if ( + hasControlsApps.compareAndSet(serviceInfos.isEmpty(), serviceInfos.isNotEmpty()) + ) { + refreshState() + } } } - } init { controlsComponent.getControlsListingController().ifPresent { @@ -105,15 +108,19 @@ class DeviceControlsTile @Inject constructor( return } - val intent = Intent().apply { - component = ComponentName(mContext, controlsComponent.getControlsUiController().get() - .resolveActivity()) - addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK) - putExtra(ControlsUiController.EXTRA_ANIMATE, true) - } + val intent = + Intent().apply { + component = + ComponentName( + mContext, + controlsComponent.getControlsUiController().get().resolveActivity(), + ) + addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK) + putExtra(ControlsUiController.EXTRA_ANIMATE, true) + } val animationController = expandable?.activityTransitionController( - InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_QS_TILE + InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_QS_TILE ) mUiHandler.post { @@ -130,17 +137,23 @@ class DeviceControlsTile @Inject constructor( override fun handleUpdateState(state: QSTile.State, arg: Any?) { state.label = tileLabel state.contentDescription = state.label + if (icon == null) { + icon = maybeLoadResourceIcon(controlsComponent.getTileImageId()) + } state.icon = icon if (controlsComponent.isEnabled() && hasControlsApps.get()) { if (controlsComponent.getVisibility() == AVAILABLE) { - val selection = controlsComponent - .getControlsController().get().getPreferredSelection() - state.state = if (selection is SelectedItem.StructureItem && - selection.structure.controls.isEmpty()) { - Tile.STATE_INACTIVE - } else { - Tile.STATE_ACTIVE - } + val selection = + controlsComponent.getControlsController().get().getPreferredSelection() + state.state = + if ( + selection is SelectedItem.StructureItem && + selection.structure.controls.isEmpty() + ) { + Tile.STATE_INACTIVE + } else { + Tile.STATE_ACTIVE + } val label = selection.name state.secondaryLabel = if (label == tileLabel) null else label } else { @@ -151,6 +164,7 @@ class DeviceControlsTile @Inject constructor( } else { state.state = Tile.STATE_UNAVAILABLE } + state.expandedAccessibilityClassName = Button::class.java.name } override fun getMetricsCategory(): Int { @@ -170,4 +184,4 @@ class DeviceControlsTile @Inject constructor( companion object { const val TILE_SPEC = "controls" } -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index ad76b4f21bfb..04f0b8736598 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -229,7 +229,7 @@ public class DndTile extends QSTileImpl<BooleanState> { state.dualTarget = true; state.value = newValue; state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; - state.icon = ResourceIcon.get(state.value + state.icon = maybeLoadResourceIcon(state.value ? R.drawable.qs_dnd_icon_on : R.drawable.qs_dnd_icon_off); state.label = getTileLabel(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java index 0d3d980f71f4..e37ed16133e5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DreamTile.java @@ -32,6 +32,7 @@ import android.service.dreams.IDreamManager; import android.service.quicksettings.Tile; import android.text.TextUtils; import android.util.Log; +import android.widget.Switch; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; @@ -64,9 +65,6 @@ public class DreamTile extends QSTileImpl<QSTile.BooleanState> { public static final String TILE_SPEC = "dream"; private static final String LOG_TAG = "QSDream"; - // TODO: consider 1 animated icon instead - private final Icon mIconDocked = ResourceIcon.get(R.drawable.ic_qs_screen_saver); - private final Icon mIconUndocked = ResourceIcon.get(R.drawable.ic_qs_screen_saver_undocked); private final IDreamManager mDreamManager; private final BroadcastDispatcher mBroadcastDispatcher; private final UserSettingObserver mEnabledSettingObserver; @@ -170,13 +168,16 @@ public class DreamTile extends QSTileImpl<QSTile.BooleanState> { state.label = getTileLabel(); state.secondaryLabel = getActiveDreamName(); state.contentDescription = getContentDescription(state.secondaryLabel); - state.icon = mIsDocked ? mIconDocked : mIconUndocked; + // TODO: consider 1 animated icon instead + state.icon = maybeLoadResourceIcon(mIsDocked + ? R.drawable.ic_qs_screen_saver : R.drawable.ic_qs_screen_saver_undocked); if (getActiveDream() == null || !isScreensaverEnabled()) { state.state = Tile.STATE_UNAVAILABLE; } else { state.state = isDreaming() ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; } + state.expandedAccessibilityClassName = Switch.class.getName(); } @Nullable diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java index 848ff3c533ba..2b127d60b2be 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FlashlightTile.java @@ -128,7 +128,7 @@ public class FlashlightTile extends QSTileImpl<BooleanState> implements R.string.quick_settings_flashlight_camera_in_use); state.stateDescription = state.secondaryLabel; state.state = Tile.STATE_UNAVAILABLE; - state.icon = ResourceIcon.get(R.drawable.qs_flashlight_icon_off); + state.icon = maybeLoadResourceIcon(R.drawable.qs_flashlight_icon_off); return; } if (arg instanceof Boolean) { @@ -143,7 +143,7 @@ public class FlashlightTile extends QSTileImpl<BooleanState> implements state.contentDescription = mContext.getString(R.string.quick_settings_flashlight_label); state.expandedAccessibilityClassName = Switch.class.getName(); state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; - state.icon = ResourceIcon.get(state.value + state.icon = maybeLoadResourceIcon(state.value ? R.drawable.qs_flashlight_icon_on : R.drawable.qs_flashlight_icon_off); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt index 7606293454f8..43e84a0ee2b4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/FontScalingTile.kt @@ -68,7 +68,7 @@ constructor( activityStarter, qsLogger, ) { - private val icon = ResourceIcon.get(R.drawable.ic_qs_font_scaling) + private var icon: QSTile.Icon? = null override fun newTileState(): QSTile.State { return QSTile.State() @@ -108,6 +108,9 @@ constructor( } override fun handleUpdateState(state: QSTile.State?, arg: Any?) { + if (icon == null) { + icon = maybeLoadResourceIcon(R.drawable.ic_qs_font_scaling) + } state?.label = mContext.getString(R.string.quick_settings_font_scaling_label) state?.icon = icon state?.contentDescription = state?.label diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java index f723ff264e0c..74563fff8775 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HearingDevicesTile.java @@ -24,6 +24,7 @@ import android.os.Looper; import android.os.UserManager; import android.provider.Settings; import android.service.quicksettings.Tile; +import android.widget.Button; import androidx.annotation.Nullable; @@ -106,7 +107,7 @@ public class HearingDevicesTile extends QSTileImpl<BooleanState> { checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_BLUETOOTH); state.label = mContext.getString(R.string.quick_settings_hearing_devices_label); - state.icon = ResourceIcon.get(R.drawable.qs_hearing_devices_icon); + state.icon = maybeLoadResourceIcon(R.drawable.qs_hearing_devices_icon); state.forceExpandIcon = true; boolean isBonded = mDevicesChecker.isAnyPairedHearingDevice(); @@ -124,6 +125,7 @@ public class HearingDevicesTile extends QSTileImpl<BooleanState> { state.state = Tile.STATE_INACTIVE; state.secondaryLabel = ""; } + state.expandedAccessibilityClassName = Button.class.getName(); } @Nullable diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index ea3993ea88a9..03bbbd7017ae 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -151,10 +151,10 @@ public class HotspotTile extends QSTileImpl<BooleanState> { state.label = mContext.getString(R.string.quick_settings_hotspot_label); state.isTransient = isTransient; if (state.isTransient) { - state.icon = ResourceIcon.get( + state.icon = maybeLoadResourceIcon( R.drawable.qs_hotspot_icon_search); } else { - state.icon = ResourceIcon.get(state.value + state.icon = maybeLoadResourceIcon(state.value ? R.drawable.qs_hotspot_icon_on : R.drawable.qs_hotspot_icon_off); } state.expandedAccessibilityClassName = Switch.class.getName(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java index 02f6f80d7282..0a5952997893 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTile.java @@ -30,7 +30,7 @@ import android.service.quicksettings.Tile; import android.text.Html; import android.text.TextUtils; import android.util.Log; -import android.widget.Switch; +import android.widget.Button; import androidx.annotation.Nullable; @@ -136,7 +136,7 @@ public class InternetTile extends QSTileImpl<QSTile.BooleanState> { } @Override - public void secondaryClick(@Nullable Expandable expandable) { + public void handleSecondaryClick(@Nullable Expandable expandable) { // TODO(b/358352265): Figure out the correct action for the secondary click // Toggle Wifi mWifiStateWorker.setWifiEnabled(!mWifiStateWorker.isWifiEnabled()); @@ -529,10 +529,10 @@ public class InternetTile extends QSTileImpl<QSTile.BooleanState> { if (cb.mAirplaneModeEnabled) { if (!state.value) { state.state = Tile.STATE_INACTIVE; - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); + state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_no_internet_unavailable); state.secondaryLabel = r.getString(R.string.status_bar_airplane); } else if (!wifiConnected) { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); + state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_no_internet_unavailable); if (cb.mNoNetworksAvailable) { state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); @@ -541,28 +541,28 @@ public class InternetTile extends QSTileImpl<QSTile.BooleanState> { r.getString(R.string.quick_settings_networks_available); } } else { - state.icon = ResourceIcon.get(cb.mWifiSignalIconId); + state.icon = maybeLoadResourceIcon(cb.mWifiSignalIconId); } } else if (cb.mNoDefaultNetwork) { if (cb.mNoNetworksAvailable || !cb.mEnabled) { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); + state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_no_internet_unavailable); state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); } else { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available); + state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_no_internet_available); state.secondaryLabel = r.getString(R.string.quick_settings_networks_available); } } else if (cb.mIsTransient) { - state.icon = ResourceIcon.get( + state.icon = maybeLoadResourceIcon( com.android.internal.R.drawable.ic_signal_wifi_transient_animation); } else if (!state.value) { state.state = Tile.STATE_INACTIVE; - state.icon = ResourceIcon.get(WifiIcons.QS_WIFI_DISABLED); + state.icon = maybeLoadResourceIcon(WifiIcons.QS_WIFI_DISABLED); } else if (wifiConnected) { - state.icon = ResourceIcon.get(cb.mWifiSignalIconId); + state.icon = maybeLoadResourceIcon(cb.mWifiSignalIconId); } else if (wifiNotConnected) { - state.icon = ResourceIcon.get(WifiIcons.QS_WIFI_NO_NETWORK); + state.icon = maybeLoadResourceIcon(WifiIcons.QS_WIFI_NO_NETWORK); } else { - state.icon = ResourceIcon.get(WifiIcons.QS_WIFI_NO_NETWORK); + state.icon = maybeLoadResourceIcon(WifiIcons.QS_WIFI_NO_NETWORK); } minimalContentDescription.append( mContext.getString(R.string.quick_settings_internet_label)).append(","); @@ -577,7 +577,7 @@ public class InternetTile extends QSTileImpl<QSTile.BooleanState> { state.contentDescription = minimalContentDescription.toString(); state.dualLabelContentDescription = r.getString( R.string.accessibility_quick_settings_open_settings, getTileLabel()); - state.expandedAccessibilityClassName = Switch.class.getName(); + state.expandedAccessibilityClassName = Button.class.getName(); if (DEBUG) { Log.d(TAG, "handleUpdateWifiState: " + "BooleanState = " + state.toString()); } @@ -594,18 +594,18 @@ public class InternetTile extends QSTileImpl<QSTile.BooleanState> { boolean mobileDataEnabled = mDataController.isMobileDataSupported() && mDataController.isMobileDataEnabled(); state.value = mobileDataEnabled; - state.expandedAccessibilityClassName = Switch.class.getName(); + state.expandedAccessibilityClassName = Button.class.getName(); if (cb.mAirplaneModeEnabled && cb.mQsTypeIcon != TelephonyIcons.ICON_CWF) { state.state = Tile.STATE_INACTIVE; - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); + state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_no_internet_unavailable); state.secondaryLabel = r.getString(R.string.status_bar_airplane); } else if (cb.mNoDefaultNetwork) { if (cb.mNoNetworksAvailable || !mSignalCallback.mWifiInfo.mEnabled) { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_unavailable); + state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_no_internet_unavailable); state.secondaryLabel = r.getString(R.string.quick_settings_networks_unavailable); } else { - state.icon = ResourceIcon.get(R.drawable.ic_qs_no_internet_available); + state.icon = maybeLoadResourceIcon(R.drawable.ic_qs_no_internet_available); state.secondaryLabel = r.getString(R.string.quick_settings_networks_available); } } else { @@ -637,7 +637,7 @@ public class InternetTile extends QSTileImpl<QSTile.BooleanState> { final Resources r = mContext.getResources(); state.label = r.getString(R.string.quick_settings_internet_label); state.state = Tile.STATE_ACTIVE; - state.icon = ResourceIcon.get(cb.mEthernetSignalIconId); + state.icon = maybeLoadResourceIcon(cb.mEthernetSignalIconId); state.secondaryLabel = cb.mEthernetContentDescription; if (DEBUG) { Log.d(TAG, "handleUpdateEthernetState: " + "BooleanState = " + state.toString()); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt index 7225800e25e3..6d3e5d07c251 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/InternetTileNewImpl.kt @@ -20,7 +20,7 @@ import android.content.Intent import android.os.Handler import android.os.Looper import android.provider.Settings -import android.widget.Switch +import android.widget.Button import com.android.internal.logging.MetricsLogger import com.android.systemui.animation.Expandable import com.android.systemui.dagger.qualifiers.Background @@ -71,7 +71,7 @@ constructor( metricsLogger, statusBarStateController, activityStarter, - qsLogger + qsLogger, ) { private var model: InternetTileModel = viewModel.tileModel.value @@ -110,7 +110,7 @@ constructor( return InternetDetailsViewModel { longClick(null) } } - override fun secondaryClick(expandable: Expandable?) { + override fun handleSecondaryClick(expandable: Expandable?) { // TODO(b/358352265): Figure out the correct action for the secondary click // Toggle wifi wifiStateWorker.isWifiEnabled = !wifiStateWorker.isWifiEnabled @@ -118,7 +118,7 @@ constructor( override fun handleUpdateState(state: QSTile.BooleanState, arg: Any?) { state.label = mContext.resources.getString(R.string.quick_settings_internet_label) - state.expandedAccessibilityClassName = Switch::class.java.name + state.expandedAccessibilityClassName = Button::class.java.name model.applyTo(state, mContext) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java index cad5c0d12d1d..f35c25f24162 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/LocationTile.java @@ -122,7 +122,7 @@ public class LocationTile extends QSTileImpl<BooleanState> { if (state.disabledByPolicy == false) { checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_CONFIG_LOCATION); } - state.icon = ResourceIcon.get(state.value + state.icon = maybeLoadResourceIcon(state.value ? R.drawable.qs_location_icon_on : R.drawable.qs_location_icon_off); state.label = mContext.getString(R.string.quick_settings_location_label); state.contentDescription = state.label; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ModesTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/ModesTile.kt index fef5a745c1ca..9c6345666403 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ModesTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ModesTile.kt @@ -120,7 +120,7 @@ constructor( tileState = tileMapper.map(config, model) state?.apply { this.state = tileState.activationState.legacyState - icon = tileState.icon?.asQSTileIcon() ?: ResourceIcon.get(ICON_RES_ID) + icon = tileState.icon?.asQSTileIcon() ?: maybeLoadResourceIcon(ICON_RES_ID) label = tileLabel secondaryLabel = tileState.secondaryLabel contentDescription = tileState.contentDescription diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java index 136eea8331df..683e4e93cf4b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java @@ -55,7 +55,8 @@ public class NfcTile extends QSTileImpl<BooleanState> { public static final String TILE_SPEC = "nfc"; private static final String NFC = TILE_SPEC; - private final Icon mIcon = ResourceIcon.get(R.drawable.ic_qs_nfc); + @Nullable + private Icon mIcon = null; @Nullable private NfcAdapter mAdapter; @@ -137,6 +138,10 @@ public class NfcTile extends QSTileImpl<BooleanState> { @Override protected void handleUpdateState(BooleanState state, Object arg) { + if (mIcon == null) { + mIcon = maybeLoadResourceIcon(R.drawable.ic_qs_nfc); + } + state.value = getAdapter() != null && getAdapter().isEnabled(); state.state = getAdapter() == null ? Tile.STATE_UNAVAILABLE diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java index ac762de6d544..2f5908752111 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NightDisplayTile.java @@ -150,7 +150,7 @@ public class NightDisplayTile extends QSTileImpl<BooleanState> implements state.label = mContext.getString(R.string.quick_settings_night_display_label); state.expandedAccessibilityClassName = Switch.class.getName(); state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; - state.icon = ResourceIcon.get(state.value ? R.drawable.qs_nightlight_icon_on + state.icon = maybeLoadResourceIcon(state.value ? R.drawable.qs_nightlight_icon_on : R.drawable.qs_nightlight_icon_off); state.secondaryLabel = getSecondaryLabel(state.value); state.contentDescription = TextUtils.isEmpty(state.secondaryLabel) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NotesTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/NotesTile.kt index 69df0961bf66..989fc0fd6f44 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NotesTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NotesTile.kt @@ -40,14 +40,14 @@ import com.android.systemui.qs.tiles.viewmodel.QSTileConfigProvider import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R import javax.inject.Inject -import kotlinx.coroutines.runBlocking /** Quick settings tile: Notes */ class NotesTile -@Inject constructor( +@Inject +constructor( private val host: QSHost, private val uiEventLogger: QsEventLogger, - @Background private val backgroundLooper: Looper, + @Background private val backgroundLooper: Looper, @Main private val mainHandler: Handler, private val falsingManager: FalsingManager, private val metricsLogger: MetricsLogger, @@ -74,8 +74,7 @@ class NotesTile private lateinit var tileState: QSTileState private val config = qsTileConfigProvider.getConfig(TILE_SPEC) - override fun getTileLabel(): CharSequence = - mContext.getString(config.uiConfig.labelRes) + override fun getTileLabel(): CharSequence = mContext.getString(config.uiConfig.labelRes) override fun newTileState(): QSTile.State? { return QSTile.State().apply { state = Tile.STATE_INACTIVE } @@ -88,13 +87,12 @@ class NotesTile override fun getLongClickIntent(): Intent = userActionInteractor.longClickIntent override fun handleUpdateState(state: QSTile.State?, arg: Any?) { - val model = - if (arg is NotesTileModel) arg else dataInteractor.getCurrentTileModel() + val model = if (arg is NotesTileModel) arg else dataInteractor.getCurrentTileModel() tileState = tileMapper.map(config, model) state?.apply { this.state = tileState.activationState.legacyState - icon = ResourceIcon.get(tileState.iconRes ?: R.drawable.ic_qs_notes) + icon = maybeLoadResourceIcon(tileState.iconRes ?: R.drawable.ic_qs_notes) label = tileState.label contentDescription = tileState.contentDescription expandedAccessibilityClassName = tileState.expandedAccessibilityClassName diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/OneHandedModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/OneHandedModeTile.java index 450c95411c3f..c605ac8d80b1 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/OneHandedModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/OneHandedModeTile.java @@ -51,8 +51,8 @@ public class OneHandedModeTile extends QSTileImpl<BooleanState> { public static final String TILE_SPEC = "onehanded"; - private final Icon mIcon = ResourceIcon.get( - com.android.internal.R.drawable.ic_qs_one_handed_mode); + @Nullable + private Icon mIcon = null; private final UserSettingObserver mSetting; @Inject @@ -125,6 +125,10 @@ public class OneHandedModeTile extends QSTileImpl<BooleanState> { @Override protected void handleUpdateState(BooleanState state, Object arg) { + if (mIcon == null) { + mIcon = maybeLoadResourceIcon(com.android.internal.R.drawable.ic_qs_one_handed_mode); + } + final int value = arg instanceof Integer ? (Integer) arg : mSetting.getValue(); final boolean enabled = value != 0; state.value = enabled; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java index 9766fac7965e..467233d5f71f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QRCodeScannerTile.java @@ -21,6 +21,7 @@ import android.os.Handler; import android.os.Looper; import android.service.quicksettings.Tile; import android.util.Log; +import android.widget.Button; import androidx.annotation.Nullable; @@ -119,13 +120,14 @@ public class QRCodeScannerTile extends QSTileImpl<QSTile.State> { protected void handleUpdateState(State state, Object arg) { state.label = mContext.getString(R.string.qr_code_scanner_title); state.contentDescription = state.label; - state.icon = ResourceIcon.get(R.drawable.ic_qr_code_scanner); + state.icon = maybeLoadResourceIcon(R.drawable.ic_qr_code_scanner); state.state = mQRCodeScannerController.isAbleToLaunchScannerActivity() ? Tile.STATE_INACTIVE : Tile.STATE_UNAVAILABLE; // The assumption is that if the OEM has the QR code scanner module enabled then the scanner // would go to "Unavailable" state only when GMS core is updating. state.secondaryLabel = state.state == Tile.STATE_UNAVAILABLE ? mContext.getString(R.string.qr_code_scanner_updating_secondary_label) : null; + state.expandedAccessibilityClassName = Button.class.getName(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java index 37d24debe958..6deb19257591 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/QuickAccessWalletTile.java @@ -40,6 +40,7 @@ import android.service.quickaccesswallet.QuickAccessWalletClient; import android.service.quickaccesswallet.WalletCard; import android.service.quicksettings.Tile; import android.util.Log; +import android.widget.Button; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -142,8 +143,16 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { InteractionJankMonitor.CUJ_SHADE_APP_LAUNCH_FROM_QS_TILE); mUiHandler.post( - () -> mController.startQuickAccessUiIntent( - mActivityStarter, animationController, mSelectedCard != null)); + () -> { + if (android.service.quickaccesswallet.Flags.launchSelectedCardFromQsTile() + && mSelectedCard != null) { + mController.startWalletCardPendingIntent( + mSelectedCard, mActivityStarter, animationController); + } else { + mController.startQuickAccessUiIntent( + mActivityStarter, animationController, mSelectedCard != null); + } + }); } @Override @@ -154,7 +163,7 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { Drawable tileIcon = mController.getWalletClient().getTileIcon(); state.icon = tileIcon == null - ? ResourceIcon.get(R.drawable.ic_wallet_lockscreen) + ? maybeLoadResourceIcon(R.drawable.ic_wallet_lockscreen) : new DrawableIcon(tileIcon); boolean isDeviceLocked = !mKeyguardStateController.isUnlocked(); if (mController.getWalletClient().isWalletServiceAvailable() @@ -178,6 +187,7 @@ public class QuickAccessWalletTile extends QSTileImpl<QSTile.State> { state.secondaryLabel = null; state.sideViewCustomDrawable = null; } + state.expandedAccessibilityClassName = Button.class.getName(); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt index 028ac6f4ac18..ca9d96ebf3e3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RecordIssueTile.kt @@ -221,13 +221,13 @@ constructor( state = Tile.STATE_ACTIVE forceExpandIcon = false secondaryLabel = mContext.getString(R.string.qs_record_issue_stop) - icon = ResourceIcon.get(R.drawable.qs_record_issue_icon_on) + icon = maybeLoadResourceIcon(R.drawable.qs_record_issue_icon_on) } else { value = false state = Tile.STATE_INACTIVE forceExpandIcon = true secondaryLabel = mContext.getString(R.string.qs_record_issue_start) - icon = ResourceIcon.get(R.drawable.qs_record_issue_icon_off) + icon = maybeLoadResourceIcon(R.drawable.qs_record_issue_icon_off) } label = tileLabel contentDescription = diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java index d624d989f42a..26d43ee92bbc 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ReduceBrightColorsTile.java @@ -141,7 +141,7 @@ public class ReduceBrightColorsTile extends QSTileImpl<QSTile.BooleanState> state.label = mContext.getString(R.string.reduce_bright_colors_feature_name); state.expandedAccessibilityClassName = Switch.class.getName(); state.contentDescription = state.label; - state.icon = ResourceIcon.get(state.value + state.icon = maybeLoadResourceIcon(state.value ? drawable.qs_extra_dim_icon_on : drawable.qs_extra_dim_icon_off); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java index 35e43b6fed9e..e361bb8ce883 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java @@ -63,7 +63,8 @@ public class RotationLockTile extends QSTileImpl<BooleanState> implements private static final String EMPTY_SECONDARY_STRING = ""; - private final Icon mIcon = ResourceIcon.get(com.android.internal.R.drawable.ic_qs_auto_rotate); + private final Icon mIcon = + maybeLoadResourceIcon(com.android.internal.R.drawable.ic_qs_auto_rotate); private final RotationLockController mController; private final SensorPrivacyManager mPrivacyManager; private final BatteryController mBatteryController; @@ -153,13 +154,13 @@ public class RotationLockTile extends QSTileImpl<BooleanState> implements && mController.isCameraRotationEnabled(); state.value = !rotationLocked; state.label = mContext.getString(R.string.quick_settings_rotation_unlocked_label); - state.icon = ResourceIcon.get(R.drawable.qs_auto_rotate_icon_off); + state.icon = maybeLoadResourceIcon(R.drawable.qs_auto_rotate_icon_off); state.contentDescription = getAccessibilityString(rotationLocked); if (!rotationLocked) { state.secondaryLabel = cameraRotation ? mContext.getResources().getString( R.string.rotation_lock_camera_rotation_on) : EMPTY_SECONDARY_STRING; - state.icon = ResourceIcon.get(R.drawable.qs_auto_rotate_icon_on); + state.icon = maybeLoadResourceIcon(R.drawable.qs_auto_rotate_icon_on); } else { state.secondaryLabel = EMPTY_SECONDARY_STRING; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java index f3be340f4951..4fb96e72d8df 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ScreenRecordTile.java @@ -18,6 +18,7 @@ package com.android.systemui.qs.tiles; import android.app.Dialog; import android.content.Intent; +import android.media.projection.StopReason; import android.os.Handler; import android.os.Looper; import android.service.quicksettings.Tile; @@ -138,9 +139,8 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> state.value = isRecording || isStarting; state.state = (isRecording || isStarting) ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; state.label = mContext.getString(R.string.quick_settings_screen_record_label); - state.icon = ResourceIcon.get(state.value - ? R.drawable.qs_screen_record_icon_on - : R.drawable.qs_screen_record_icon_off); + state.icon = maybeLoadResourceIcon(state.value + ? R.drawable.qs_screen_record_icon_on : R.drawable.qs_screen_record_icon_off); // Show expand icon when clicking will open a dialog state.forceExpandIcon = state.state == Tile.STATE_INACTIVE; @@ -225,7 +225,7 @@ public class ScreenRecordTile extends QSTileImpl<QSTile.BooleanState> } private void stopRecording() { - mController.stopRecording(); + mController.stopRecording(StopReason.STOP_QS_TILE); } private final class Callback implements RecordingController.RecordingStateChangeCallback { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/SensorPrivacyToggleTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/SensorPrivacyToggleTile.java index 036ce080c543..b62e858e6ade 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/SensorPrivacyToggleTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/SensorPrivacyToggleTile.java @@ -119,7 +119,7 @@ public abstract class SensorPrivacyToggleTile extends QSTileImpl<QSTile.BooleanS checkIfRestrictionEnforcedByAdminOnly(state, getRestriction()); - state.icon = ResourceIcon.get(getIconRes(isBlocked)); + state.icon = maybeLoadResourceIcon(getIconRes(isBlocked)); state.state = isBlocked ? Tile.STATE_INACTIVE : Tile.STATE_ACTIVE; state.value = !isBlocked; state.label = getTileLabel(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java index 0cee7ddfeaa0..61beb6ca1a71 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/UiModeNightTile.java @@ -167,7 +167,7 @@ public class UiModeNightTile extends QSTileImpl<QSTile.BooleanState> implements } else { state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE; } - state.icon = ResourceIcon.get(state.state == Tile.STATE_ACTIVE + state.icon = maybeLoadResourceIcon(state.state == Tile.STATE_ACTIVE ? R.drawable.qs_light_dark_theme_icon_on : R.drawable.qs_light_dark_theme_icon_off); state.expandedAccessibilityClassName = Switch.class.getName(); diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java index 1750347fd2ae..f6f89f759e0d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/WorkModeTile.java @@ -53,8 +53,8 @@ public class WorkModeTile extends QSTileImpl<BooleanState> implements public static final String TILE_SPEC = "work"; - private final Icon mIcon = ResourceIcon.get( - com.android.internal.R.drawable.stat_sys_managed_profile_status); + @Nullable + private Icon mIcon = null; private final ManagedProfileController mProfileController; @@ -129,6 +129,11 @@ public class WorkModeTile extends QSTileImpl<BooleanState> implements state.value = mProfileController.isWorkModeEnabled(); } + if (mIcon == null) { + mIcon = maybeLoadResourceIcon( + com.android.internal.R.drawable.stat_sys_managed_profile_status); + } + state.icon = mIcon; state.label = getTileLabel(); state.contentDescription = state.label; diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImpl.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImpl.kt index 87f542e6ab39..aeb6cef162b5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/base/viewmodel/QSTileViewModelImpl.kt @@ -17,6 +17,7 @@ package com.android.systemui.qs.tiles.base.viewmodel import android.os.UserHandle +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.Dumpable import com.android.systemui.plugins.FalsingManager import com.android.systemui.qs.tiles.base.analytics.QSTileAnalytics @@ -58,11 +59,8 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart -import kotlinx.coroutines.flow.shareIn import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.transformLatest -import com.android.app.tracing.coroutines.launchTraced as launch -import kotlinx.coroutines.withContext /** * Provides a hassle-free way to implement new tiles according to current System UI architecture @@ -90,36 +88,35 @@ class QSTileViewModelImpl<DATA_TYPE>( private val users: MutableStateFlow<UserHandle> = MutableStateFlow(userRepository.getSelectedUserInfo().userHandle) + private val userInputs: MutableSharedFlow<QSTileUserAction> = MutableSharedFlow() + private val forceUpdates: MutableSharedFlow<Unit> = MutableSharedFlow() private val spec get() = config.tileSpec - private val tileData: SharedFlow<DATA_TYPE> = createTileDataFlow() + private val tileData: SharedFlow<DATA_TYPE?> = createTileDataFlow() override val state: StateFlow<QSTileState?> = tileData .map { data -> - withContext(uiBackgroundDispatcher) { mapper().map(config, data) } - .also { state -> qsTileLogger.logStateUpdate(spec, state, data) } + data?.let { + mapper().map(config, it).also { state -> + qsTileLogger.logStateUpdate(spec, state, it) + } + } } - .stateIn( - tileScope, - SharingStarted.WhileSubscribed(), - null, - ) + .flowOn(uiBackgroundDispatcher) + .stateIn(tileScope, SharingStarted.WhileSubscribed(), null) + override val isAvailable: StateFlow<Boolean> = users .flatMapLatest { tileDataInteractor().availability(it) } .flowOn(backgroundDispatcher) - .stateIn( - tileScope, - SharingStarted.WhileSubscribed(), - true, - ) + .stateIn(tileScope, SharingStarted.WhileSubscribed(), true) override fun forceUpdate() { - tileScope.launch { forceUpdates.emit(Unit) } + tileScope.launch(context = backgroundDispatcher) { forceUpdates.emit(Unit) } } override fun onUserChanged(user: UserHandle) { @@ -131,9 +128,9 @@ class QSTileViewModelImpl<DATA_TYPE>( userAction, spec, tileData.replayCache.isNotEmpty(), - state.replayCache.isNotEmpty() + state.replayCache.isNotEmpty(), ) - tileScope.launch { userInputs.emit(userAction) } + tileScope.launch(context = backgroundDispatcher) { userInputs.emit(userAction) } } override fun destroy() { @@ -147,7 +144,7 @@ class QSTileViewModelImpl<DATA_TYPE>( println(state.replayCache.lastOrNull().toString()) } - private fun createTileDataFlow(): SharedFlow<DATA_TYPE> = + private fun createTileDataFlow(): SharedFlow<DATA_TYPE?> = users .transformLatest { user -> coroutineScope { @@ -159,6 +156,7 @@ class QSTileViewModelImpl<DATA_TYPE>( .onEach { qsTileLogger.logForceUpdate(spec) }, ) .onStart { qsTileLogger.logInitialRequest(spec) } + .flowOn(backgroundDispatcher) .stateIn(this, SharingStarted.Eagerly, DataUpdateTrigger.InitialRequest) tileDataInteractor() .tileData(user, updateTriggers) @@ -171,11 +169,8 @@ class QSTileViewModelImpl<DATA_TYPE>( } } .distinctUntilChanged() - .shareIn( - tileScope, - SharingStarted.WhileSubscribed(), - replay = 1, // we only care about the most recent value - ) + .flowOn(backgroundDispatcher) + .stateIn(tileScope, SharingStarted.WhileSubscribed(), null) /** * Creates a user input flow which: diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/airplane/domain/AirplaneModeMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/airplane/domain/AirplaneModeMapper.kt index d67057a2f476..34c2ec90f1e8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/airplane/domain/AirplaneModeMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/airplane/domain/AirplaneModeMapper.kt @@ -19,18 +19,18 @@ package com.android.systemui.qs.tiles.impl.airplane.domain import android.content.res.Resources import android.content.res.Resources.Theme import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.airplane.domain.model.AirplaneModeTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [AirplaneModeTileModel] to [QSTileState]. */ class AirplaneModeMapper @Inject -constructor(@Main private val resources: Resources, val theme: Theme) : +constructor(@ShadeDisplayAware private val resources: Resources, val theme: Theme) : QSTileDataToStateMapper<AirplaneModeTileModel> { override fun map(config: QSTileConfig, data: AirplaneModeTileModel): QSTileState = diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt index 7322b8d098fd..a72992db4496 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/alarm/domain/AlarmTileMapper.kt @@ -19,12 +19,12 @@ package com.android.systemui.qs.tiles.impl.alarm.domain import android.content.res.Resources import android.content.res.Resources.Theme import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.alarm.domain.model.AlarmTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.time.SystemClock import java.time.Instant import java.time.LocalDateTime @@ -36,7 +36,7 @@ import javax.inject.Inject class AlarmTileMapper @Inject constructor( - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val theme: Theme, private val clock: SystemClock, ) : QSTileDataToStateMapper<AlarmTileModel> { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/battery/ui/BatterySaverTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/battery/ui/BatterySaverTileMapper.kt index 5b30e8d2c86b..e116d8cef2ee 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/battery/ui/BatterySaverTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/battery/ui/BatterySaverTileMapper.kt @@ -18,19 +18,21 @@ package com.android.systemui.qs.tiles.impl.battery.ui import android.content.res.Resources import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.battery.domain.model.BatterySaverTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [BatterySaverTileModel] to [QSTileState]. */ open class BatterySaverTileMapper @Inject -constructor(@Main protected val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<BatterySaverTileModel> { +constructor( + @ShadeDisplayAware protected val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<BatterySaverTileModel> { override fun map(config: QSTileConfig, data: BatterySaverTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/colorcorrection/domain/ColorCorrectionTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/colorcorrection/domain/ColorCorrectionTileMapper.kt index 7c90b3d87958..21b9f659dde4 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/colorcorrection/domain/ColorCorrectionTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/colorcorrection/domain/ColorCorrectionTileMapper.kt @@ -18,19 +18,21 @@ package com.android.systemui.qs.tiles.impl.colorcorrection.domain import android.content.res.Resources import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.colorcorrection.domain.model.ColorCorrectionTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [ColorCorrectionTileModel] to [QSTileState]. */ class ColorCorrectionTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<ColorCorrectionTileModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<ColorCorrectionTileModel> { override fun map(config: QSTileConfig, data: ColorCorrectionTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractor.kt index 8f870d468997..4806c3f83224 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractor.kt @@ -18,7 +18,7 @@ package com.android.systemui.qs.tiles.impl.custom.domain.interactor import android.os.UserHandle import android.service.quicksettings.Tile -import com.android.systemui.common.coroutine.ConflatedCallbackFlow +import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor @@ -28,6 +28,7 @@ import com.android.systemui.qs.tiles.impl.custom.data.repository.CustomTilePacka import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel import com.android.systemui.qs.tiles.impl.di.QSTileScope import com.android.systemui.user.data.repository.UserRepository +import com.android.systemui.utils.coroutines.flow.conflatedCallbackFlow import javax.inject.Inject import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -44,7 +45,6 @@ import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.shareIn -import com.android.app.tracing.coroutines.launchTraced as launch @QSTileScope @OptIn(ExperimentalCoroutinesApi::class) @@ -64,7 +64,7 @@ constructor( private val bindingFlow = mutableUserFlow .flatMapLatest { user -> - ConflatedCallbackFlow.conflatedCallbackFlow { + conflatedCallbackFlow { serviceInteractor.setUser(user) // Wait for the CustomTileInteractor to become initialized first, because @@ -79,7 +79,7 @@ constructor( defaultsRepository.requestNewDefaults( user, tileSpec.componentName, - true + true, ) } .launchIn(this) @@ -99,7 +99,7 @@ constructor( override fun tileData( user: UserHandle, - triggers: Flow<DataUpdateTrigger> + triggers: Flow<DataUpdateTrigger>, ): Flow<CustomTileDataModel> { tileScope.launch { mutableUserFlow.emit(user) } return bindingFlow.combine(triggers) { _, _ -> }.flatMapLatest { dataFlow(user) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/FlashlightMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/FlashlightMapper.kt index 7e557ebe4639..2dfb1fc4fe98 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/FlashlightMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/flashlight/domain/FlashlightMapper.kt @@ -19,18 +19,18 @@ package com.android.systemui.qs.tiles.impl.flashlight.domain import android.content.res.Resources import android.content.res.Resources.Theme import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.flashlight.domain.model.FlashlightTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [FlashlightTileModel] to [QSTileState]. */ class FlashlightMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Theme) : +constructor(@ShadeDisplayAware private val resources: Resources, private val theme: Theme) : QSTileDataToStateMapper<FlashlightTileModel> { override fun map(config: QSTileConfig, data: FlashlightTileModel): QSTileState = diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/FontScalingTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/FontScalingTileMapper.kt index 9d44fc6ae25e..7f41cbd322dd 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/FontScalingTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/fontscaling/domain/FontScalingTileMapper.kt @@ -18,19 +18,21 @@ package com.android.systemui.qs.tiles.impl.fontscaling.domain import android.content.res.Resources import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.fontscaling.domain.model.FontScalingTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [FontScalingTileModel] to [QSTileState]. */ class FontScalingTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<FontScalingTileModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<FontScalingTileModel> { override fun map(config: QSTileConfig, data: FontScalingTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/hearingdevices/domain/HearingDevicesTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/hearingdevices/domain/HearingDevicesTileMapper.kt index c3ac1f8d9a72..4c302b363c3b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/hearingdevices/domain/HearingDevicesTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/hearingdevices/domain/HearingDevicesTileMapper.kt @@ -18,19 +18,21 @@ package com.android.systemui.qs.tiles.impl.hearingdevices.domain import android.content.res.Resources import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.hearingdevices.domain.model.HearingDevicesTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [HearingDevicesTileModel] to [QSTileState]. */ class HearingDevicesTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<HearingDevicesTileModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<HearingDevicesTileModel> { override fun map(config: QSTileConfig, data: HearingDevicesTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/inversion/domain/ColorInversionTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/inversion/domain/ColorInversionTileMapper.kt index 3692c35472f2..8d35b2413bad 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/inversion/domain/ColorInversionTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/inversion/domain/ColorInversionTileMapper.kt @@ -19,18 +19,18 @@ package com.android.systemui.qs.tiles.impl.inversion.domain import android.content.res.Resources import android.content.res.Resources.Theme import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.inversion.domain.model.ColorInversionTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [ColorInversionTileModel] to [QSTileState]. */ class ColorInversionTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Theme) : +constructor(@ShadeDisplayAware private val resources: Resources, private val theme: Theme) : QSTileDataToStateMapper<ColorInversionTileModel> { override fun map(config: QSTileConfig, data: ColorInversionTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/irecording/IssueRecordingMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/irecording/IssueRecordingMapper.kt index 3fe2a7734801..3557c1a4ac9d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/irecording/IssueRecordingMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/irecording/IssueRecordingMapper.kt @@ -19,16 +19,16 @@ package com.android.systemui.qs.tiles.impl.irecording import android.content.res.Resources import android.content.res.Resources.Theme import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject class IssueRecordingMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Theme) : +constructor(@ShadeDisplayAware private val resources: Resources, private val theme: Theme) : QSTileDataToStateMapper<IssueRecordingModel> { override fun map(config: QSTileConfig, data: IssueRecordingModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/location/domain/LocationTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/location/domain/LocationTileMapper.kt index 08432f685ea8..dfc24a10c491 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/location/domain/LocationTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/location/domain/LocationTileMapper.kt @@ -19,18 +19,18 @@ package com.android.systemui.qs.tiles.impl.location.domain import android.content.res.Resources import android.content.res.Resources.Theme import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.location.domain.model.LocationTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [LocationTileModel] to [QSTileState]. */ class LocationTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Theme) : +constructor(@ShadeDisplayAware private val resources: Resources, private val theme: Theme) : QSTileDataToStateMapper<LocationTileModel> { override fun map(config: QSTileConfig, data: LocationTileModel): QSTileState = diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt index 4a6431359ca2..bac048f1786a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/modes/ui/ModesTileMapper.kt @@ -19,18 +19,18 @@ package com.android.systemui.qs.tiles.impl.modes.ui import android.content.res.Resources import android.icu.text.MessageFormat import android.widget.Button -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.modes.domain.model.ModesTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import java.util.Locale import javax.inject.Inject class ModesTileMapper @Inject -constructor(@Main private val resources: Resources, val theme: Resources.Theme) : +constructor(@ShadeDisplayAware private val resources: Resources, val theme: Resources.Theme) : QSTileDataToStateMapper<ModesTileModel> { override fun map(config: QSTileConfig, data: ModesTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/domain/interactor/NightDisplayTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/domain/interactor/NightDisplayTileDataInteractor.kt index 88bd224881b5..e8e43e8fc749 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/domain/interactor/NightDisplayTileDataInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/domain/interactor/NightDisplayTileDataInteractor.kt @@ -20,10 +20,10 @@ import android.content.Context import android.hardware.display.ColorDisplayManager import android.os.UserHandle import com.android.systemui.accessibility.data.repository.NightDisplayRepository -import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor import com.android.systemui.qs.tiles.impl.night.domain.model.NightDisplayTileModel +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.time.DateFormatUtil import java.time.LocalTime import javax.inject.Inject @@ -35,14 +35,14 @@ import kotlinx.coroutines.flow.map class NightDisplayTileDataInteractor @Inject constructor( - @Application private val context: Context, + @ShadeDisplayAware private val context: Context, private val dateFormatUtil: DateFormatUtil, private val nightDisplayRepository: NightDisplayRepository, ) : QSTileDataInteractor<NightDisplayTileModel> { override fun tileData( user: UserHandle, - triggers: Flow<DataUpdateTrigger> + triggers: Flow<DataUpdateTrigger>, ): Flow<NightDisplayTileModel> = nightDisplayRepository.nightDisplayState(user).map { generateModel( @@ -51,7 +51,7 @@ constructor( it.startTime, it.endTime, it.shouldForceAutoMode, - it.locationEnabled + it.locationEnabled, ) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/ui/NightDisplayTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/ui/NightDisplayTileMapper.kt index 081a03c7ae67..3569e4d0b42c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/ui/NightDisplayTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/night/ui/NightDisplayTileMapper.kt @@ -22,7 +22,6 @@ import android.text.TextUtils import androidx.annotation.StringRes import com.android.systemui.accessibility.qs.QSAccessibilityModule import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.pipeline.shared.TileSpec import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.base.logging.QSTileLogger @@ -30,6 +29,7 @@ import com.android.systemui.qs.tiles.impl.night.domain.model.NightDisplayTileMod import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import java.time.DateTimeException import java.time.LocalTime import java.time.format.DateTimeFormatter @@ -39,7 +39,7 @@ import javax.inject.Inject class NightDisplayTileMapper @Inject constructor( - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val theme: Resources.Theme, private val logger: QSTileLogger, ) : QSTileDataToStateMapper<NightDisplayTileModel> { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapper.kt index ee1b9e5171b7..a5436192af39 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/notes/domain/NotesTileMapper.kt @@ -19,28 +19,24 @@ package com.android.systemui.qs.tiles.impl.notes.domain import android.content.res.Resources import android.widget.Button import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.notes.domain.model.NotesTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject class NotesTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<NotesTileModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<NotesTileModel> { override fun map(config: QSTileConfig, data: NotesTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { iconRes = R.drawable.ic_qs_notes - icon = - Icon.Loaded( - resources.getDrawable( - iconRes!!, - theme), - contentDescription = null - ) + icon = Icon.Loaded(resources.getDrawable(iconRes!!, theme), contentDescription = null) contentDescription = label activationState = QSTileState.ActivationState.INACTIVE sideViewIcon = QSTileState.SideViewIcon.Chevron diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/onehanded/ui/OneHandedModeTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/onehanded/ui/OneHandedModeTileMapper.kt index 8e5d0d4eb3dc..76f1e8b8760c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/onehanded/ui/OneHandedModeTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/onehanded/ui/OneHandedModeTileMapper.kt @@ -18,19 +18,21 @@ package com.android.systemui.qs.tiles.impl.onehanded.ui import android.content.res.Resources import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.onehanded.domain.model.OneHandedModeTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [OneHandedModeTileModel] to [QSTileState]. */ class OneHandedModeTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<OneHandedModeTileModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<OneHandedModeTileModel> { override fun map(config: QSTileConfig, data: OneHandedModeTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/qr/ui/QRCodeScannerTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/qr/ui/QRCodeScannerTileMapper.kt index 5c6351e88494..c546250e73d2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/qr/ui/QRCodeScannerTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/qr/ui/QRCodeScannerTileMapper.kt @@ -18,19 +18,21 @@ package com.android.systemui.qs.tiles.impl.qr.ui import android.content.res.Resources import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.qr.domain.model.QRCodeScannerTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [QRCodeScannerTileModel] to [QSTileState]. */ class QRCodeScannerTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<QRCodeScannerTileModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<QRCodeScannerTileModel> { override fun map(config: QSTileConfig, data: QRCodeScannerTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/domain/interactor/ReduceBrightColorsTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/domain/interactor/ReduceBrightColorsTileUserActionInteractor.kt index 15c9901d10c2..eff5f8f949c2 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/domain/interactor/ReduceBrightColorsTileUserActionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/domain/interactor/ReduceBrightColorsTileUserActionInteractor.kt @@ -20,20 +20,20 @@ import android.content.Intent import android.content.res.Resources import android.provider.Settings import com.android.systemui.accessibility.extradim.ExtraDimDialogManager -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.ReduceBrightColorsController import com.android.systemui.qs.tiles.base.actions.QSTileIntentUserInputHandler import com.android.systemui.qs.tiles.base.interactor.QSTileInput import com.android.systemui.qs.tiles.base.interactor.QSTileUserActionInteractor import com.android.systemui.qs.tiles.impl.reducebrightness.domain.model.ReduceBrightColorsTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileUserAction +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Handles reduce bright colors tile clicks. */ class ReduceBrightColorsTileUserActionInteractor @Inject constructor( - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val qsTileIntentUserActionHandler: QSTileIntentUserInputHandler, private val reduceBrightColorsController: ReduceBrightColorsController, private val extraDimDialogManager: ExtraDimDialogManager, diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/ui/ReduceBrightColorsTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/ui/ReduceBrightColorsTileMapper.kt index fe77fe61b4bf..66d0f96fdcde 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/ui/ReduceBrightColorsTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/reducebrightness/ui/ReduceBrightColorsTileMapper.kt @@ -19,19 +19,21 @@ package com.android.systemui.qs.tiles.impl.reducebrightness.ui import android.content.res.Resources import android.service.quicksettings.Tile import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.reducebrightness.domain.model.ReduceBrightColorsTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [ReduceBrightColorsTileModel] to [QSTileState]. */ class ReduceBrightColorsTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<ReduceBrightColorsTileModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<ReduceBrightColorsTileModel> { override fun map(config: QSTileConfig, data: ReduceBrightColorsTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt index 57a60c179581..7f17a3a7481a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt @@ -22,10 +22,10 @@ import android.content.res.Resources import android.os.UserHandle import com.android.systemui.camera.data.repository.CameraAutoRotateRepository import com.android.systemui.camera.data.repository.CameraSensorPrivacyRepository -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor import com.android.systemui.qs.tiles.impl.rotation.domain.model.RotationLockTileModel +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.policy.BatteryController import com.android.systemui.statusbar.policy.RotationLockController import com.android.systemui.util.kotlin.isBatteryPowerSaveEnabled @@ -44,30 +44,29 @@ constructor( private val cameraAutoRotateRepository: CameraAutoRotateRepository, private val cameraSensorPrivacyRepository: CameraSensorPrivacyRepository, private val packageManager: PackageManager, - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, ) : QSTileDataInteractor<RotationLockTileModel> { override fun tileData( user: UserHandle, - triggers: Flow<DataUpdateTrigger> + triggers: Flow<DataUpdateTrigger>, ): Flow<RotationLockTileModel> = combine( rotationLockController.isRotationLockEnabled(), cameraSensorPrivacyRepository.isEnabled(user), batteryController.isBatteryPowerSaveEnabled(), - cameraAutoRotateRepository.isCameraAutoRotateSettingEnabled(user) + cameraAutoRotateRepository.isCameraAutoRotateSettingEnabled(user), ) { isRotationLockEnabled, isCamPrivacySensorEnabled, isBatteryPowerSaveEnabled, - isCameraAutoRotateEnabled, - -> + isCameraAutoRotateEnabled -> RotationLockTileModel( isRotationLockEnabled, isCameraRotationEnabled( isBatteryPowerSaveEnabled, isCamPrivacySensorEnabled, - isCameraAutoRotateEnabled + isCameraAutoRotateEnabled, ), ) } @@ -84,7 +83,7 @@ constructor( private fun isCameraRotationEnabled( isBatteryPowerSaverModeOn: Boolean, isCameraSensorPrivacyEnabled: Boolean, - isCameraAutoRotateEnabled: Boolean + isCameraAutoRotateEnabled: Boolean, ): Boolean = resources.getBoolean(com.android.internal.R.bool.config_allowRotationResolver) && !isBatteryPowerSaverModeOn && diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/ui/mapper/RotationLockTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/ui/mapper/RotationLockTileMapper.kt index 9a003ffdf7de..a0144221577d 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/ui/mapper/RotationLockTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/ui/mapper/RotationLockTileMapper.kt @@ -19,12 +19,12 @@ package com.android.systemui.qs.tiles.impl.rotation.ui.mapper import android.content.res.Resources import android.hardware.devicestate.DeviceStateManager import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.rotation.domain.model.RotationLockTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.policy.DevicePostureController import com.android.systemui.util.Utils.isDeviceFoldable import javax.inject.Inject @@ -33,7 +33,7 @@ import javax.inject.Inject class RotationLockTileMapper @Inject constructor( - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val theme: Resources.Theme, private val devicePostureController: DevicePostureController, private val deviceStateManager: DeviceStateManager, diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/DataSaverTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/DataSaverTileMapper.kt index 08196bbfe2f3..aea4967c546c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/DataSaverTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/saver/domain/DataSaverTileMapper.kt @@ -18,19 +18,21 @@ package com.android.systemui.qs.tiles.impl.saver.domain import android.content.res.Resources import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.saver.domain.model.DataSaverTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [DataSaverTileModel] to [QSTileState]. */ class DataSaverTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<DataSaverTileModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<DataSaverTileModel> { override fun map(config: QSTileConfig, data: DataSaverTileModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { with(data) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt index 85aa6745e438..94534479db57 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractor.kt @@ -16,6 +16,7 @@ package com.android.systemui.qs.tiles.impl.screenrecord.domain.interactor +import android.media.projection.StopReason import android.util.Log import com.android.internal.jank.InteractionJankMonitor import com.android.systemui.animation.DialogCuj @@ -61,7 +62,9 @@ constructor( Log.d(TAG, "Cancelling countdown") withContext(backgroundContext) { recordingController.cancelCountdown() } } - is ScreenRecordModel.Recording -> screenRecordRepository.stopRecording() + is ScreenRecordModel.Recording -> { + screenRecordRepository.stopRecording(StopReason.STOP_QS_TILE) + } is ScreenRecordModel.DoingNothing -> withContext(mainContext) { showPrompt(action.expandable, user.identifier) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/ui/ScreenRecordTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/ui/ScreenRecordTileMapper.kt index ba06de966c10..f3136e015acf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/ui/ScreenRecordTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/ui/ScreenRecordTileMapper.kt @@ -19,19 +19,21 @@ package com.android.systemui.qs.tiles.impl.screenrecord.domain.ui import android.content.res.Resources import android.text.TextUtils import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R import com.android.systemui.screenrecord.data.model.ScreenRecordModel +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [ScreenRecordModel] to [QSTileState]. */ class ScreenRecordTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Resources.Theme) : - QSTileDataToStateMapper<ScreenRecordModel> { +constructor( + @ShadeDisplayAware private val resources: Resources, + private val theme: Resources.Theme, +) : QSTileDataToStateMapper<ScreenRecordModel> { override fun map(config: QSTileConfig, data: ScreenRecordModel): QSTileState = QSTileState.build(resources, theme, config.uiConfig) { label = resources.getString(R.string.quick_settings_screen_record_label) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/sensorprivacy/ui/SensorPrivacyToggleTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/sensorprivacy/ui/SensorPrivacyToggleTileMapper.kt index b4cfec48fb0a..73e61b7d178e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/sensorprivacy/ui/SensorPrivacyToggleTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/sensorprivacy/ui/SensorPrivacyToggleTileMapper.kt @@ -18,12 +18,12 @@ package com.android.systemui.qs.tiles.impl.sensorprivacy.ui import android.content.res.Resources import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.sensorprivacy.domain.model.SensorPrivacyToggleTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject @@ -32,7 +32,7 @@ import dagger.assisted.AssistedInject class SensorPrivacyToggleTileMapper @AssistedInject constructor( - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val theme: Resources.Theme, @Assisted private val sensorPrivacyTileResources: SensorPrivacyTileResources, ) : QSTileDataToStateMapper<SensorPrivacyToggleTileModel> { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/UiModeNightTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/UiModeNightTileMapper.kt index eda8e5ce8c43..e9aa46c5f253 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/UiModeNightTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/UiModeNightTileMapper.kt @@ -21,12 +21,12 @@ import android.content.res.Resources import android.content.res.Resources.Theme import android.text.TextUtils import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.uimodenight.domain.model.UiModeNightTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import java.time.LocalTime import java.time.format.DateTimeFormatter import javax.inject.Inject @@ -34,7 +34,7 @@ import javax.inject.Inject /** Maps [UiModeNightTileModel] to [QSTileState]. */ class UiModeNightTileMapper @Inject -constructor(@Main private val resources: Resources, private val theme: Theme) : +constructor(@ShadeDisplayAware private val resources: Resources, private val theme: Theme) : QSTileDataToStateMapper<UiModeNightTileModel> { companion object { val formatter12Hour: DateTimeFormatter = DateTimeFormatter.ofPattern("hh:mm a") diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/interactor/UiModeNightTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/interactor/UiModeNightTileDataInteractor.kt index 7af3576d8cd9..925b91326a25 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/interactor/UiModeNightTileDataInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/uimodenight/domain/interactor/UiModeNightTileDataInteractor.kt @@ -21,7 +21,6 @@ import android.content.Context import android.content.res.Configuration import android.os.UserHandle import com.android.systemui.common.coroutine.ConflatedCallbackFlow -import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger import com.android.systemui.qs.tiles.base.interactor.QSTileDataInteractor import com.android.systemui.qs.tiles.impl.uimodenight.domain.model.UiModeNightTileModel @@ -40,7 +39,7 @@ class UiModeNightTileDataInteractor @Inject constructor( @ShadeDisplayAware private val context: Context, - private val configurationController: ConfigurationController, + @ShadeDisplayAware private val configurationController: ConfigurationController, private val uiModeManager: UiModeManager, private val batteryController: BatteryController, private val locationController: LocationController, @@ -49,7 +48,7 @@ constructor( override fun tileData( user: UserHandle, - triggers: Flow<DataUpdateTrigger> + triggers: Flow<DataUpdateTrigger>, ): Flow<UiModeNightTileModel> = ConflatedCallbackFlow.conflatedCallbackFlow { // send initial state @@ -106,7 +105,7 @@ constructor( nightModeCustomType, use24HourFormat, customNightModeEnd, - customNightModeStart + customNightModeStart, ) } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/work/ui/WorkModeTileMapper.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/work/ui/WorkModeTileMapper.kt index a1bc8a889a1b..6a3195a493c8 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/work/ui/WorkModeTileMapper.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/work/ui/WorkModeTileMapper.kt @@ -21,19 +21,19 @@ import android.app.admin.DevicePolicyResources.Strings.SystemUi.QS_WORK_PROFILE_ import android.content.res.Resources import android.service.quicksettings.Tile import com.android.systemui.common.shared.model.Icon -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.qs.tiles.base.interactor.QSTileDataToStateMapper import com.android.systemui.qs.tiles.impl.work.domain.model.WorkModeTileModel import com.android.systemui.qs.tiles.viewmodel.QSTileConfig import com.android.systemui.qs.tiles.viewmodel.QSTileState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** Maps [WorkModeTileModel] to [QSTileState]. */ class WorkModeTileMapper @Inject constructor( - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val theme: Resources.Theme, private val devicePolicyManager: DevicePolicyManager, ) : QSTileDataToStateMapper<WorkModeTileModel> { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt index ab3862b75ee8..f9a1ad5d8424 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapter.kt @@ -25,6 +25,7 @@ import com.android.systemui.Dumpable import com.android.systemui.animation.Expandable import com.android.systemui.common.shared.model.Icon import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.dagger.qualifiers.UiBackground import com.android.systemui.plugins.qs.QSTile import com.android.systemui.qs.QSHost import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIcon @@ -35,14 +36,17 @@ import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject import java.io.PrintWriter import java.util.concurrent.CopyOnWriteArraySet +import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.flow.collectIndexed import kotlinx.coroutines.flow.filterNotNull +import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.takeWhile +import kotlinx.coroutines.launch // TODO(b/http://b/299909989): Use QSTileViewModel directly after the rollout class QSTileViewModelAdapter @@ -51,6 +55,7 @@ constructor( @Application private val applicationScope: CoroutineScope, private val qsHost: QSHost, @Assisted private val qsTileViewModel: QSTileViewModel, + @UiBackground private val uiBgDispatcher: CoroutineDispatcher, ) : QSTile, Dumpable { private val context @@ -162,19 +167,25 @@ constructor( override fun setListening(client: Any?, listening: Boolean) { client ?: return if (listening) { - val clientWasNotAlreadyListening = listeningClients.add(client) - if (clientWasNotAlreadyListening && listeningClients.size == 1) { - stateJob = - qsTileViewModel.state - .filterNotNull() - .map { mapState(context, it, qsTileViewModel.config) } - .onEach { legacyState -> - val changed = legacyState.copyTo(cachedState) - if (changed) { - callbacks.forEach { it.onStateChanged(legacyState) } + applicationScope.launch(uiBgDispatcher) { + val shouldStartMappingJob = + listeningClients.add(client) // new client + && listeningClients.size == 1 // first client + + if (shouldStartMappingJob) { + stateJob = + qsTileViewModel.state + .filterNotNull() + .map { mapState(context, it, qsTileViewModel.config) } + .onEach { legacyState -> + val changed = legacyState.copyTo(cachedState) + if (changed) { + callbacks.forEach { it.onStateChanged(legacyState) } + } } - } - .launchIn(applicationScope) + .flowOn(uiBgDispatcher) + .launchIn(applicationScope) + } } } else { listeningClients.remove(client) diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index a5eb92b10239..e3cf41191384 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -26,11 +26,6 @@ import static android.view.MotionEvent.ACTION_UP; import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON; import static android.window.BackEvent.EDGE_NONE; -import static com.android.window.flags.Flags.predictiveBackSwipeEdgeNoneApi; -import static com.android.window.flags.Flags.predictiveBackThreeButtonNav; -import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_SYSUI_PROXY; -import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER; -import static com.android.systemui.shared.system.QuickStepContract.KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_AWAKE; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_BOUNCER_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_COMMUNAL_HUB_SHOWING; @@ -42,6 +37,9 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_S import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING_OCCLUDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_VOICE_INTERACTION_WINDOW_SHOWING; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_WAKEFULNESS_TRANSITION; +import static com.android.systemui.shared.system.QuickStepContract.addInterface; +import static com.android.window.flags.Flags.predictiveBackSwipeEdgeNoneApi; +import static com.android.window.flags.Flags.predictiveBackThreeButtonNav; import android.annotation.FloatRange; import android.annotation.Nullable; @@ -559,13 +557,9 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis mOverviewProxy = IOverviewProxy.Stub.asInterface(service); Bundle params = new Bundle(); - params.putBinder(KEY_EXTRA_SYSUI_PROXY, mSysUiProxy.asBinder()); - params.putBinder(KEY_EXTRA_UNLOCK_ANIMATION_CONTROLLER, - mSysuiUnlockAnimationController.asBinder()); - mUnfoldTransitionProgressForwarder.ifPresent( - unfoldProgressForwarder -> params.putBinder( - KEY_EXTRA_UNFOLD_ANIMATION_FORWARDER, - unfoldProgressForwarder.asBinder())); + addInterface(mSysUiProxy, params); + addInterface(mSysuiUnlockAnimationController, params); + addInterface(mUnfoldTransitionProgressForwarder.orElse(null), params); // Add all the interfaces exposed by the shell mShellInterface.createExternalInterfaces(params); diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt index 7d7cab41cf96..c45906840385 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootView.kt @@ -5,7 +5,6 @@ import android.util.AttributeSet import android.view.MotionEvent import android.view.View import android.view.WindowInsets -import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerDependencies import com.android.systemui.qs.ui.adapter.QSSceneAdapter import com.android.systemui.scene.shared.model.SceneContainerConfig import com.android.systemui.scene.shared.model.SceneDataSourceDelegator @@ -35,7 +34,6 @@ class SceneWindowRootView(context: Context, attrs: AttributeSet?) : WindowRootVi layoutInsetController: LayoutInsetsController, sceneDataSourceDelegator: SceneDataSourceDelegator, qsSceneAdapter: Provider<QSSceneAdapter>, - alternateBouncerDependencies: AlternateBouncerDependencies, ) { setLayoutInsetsController(layoutInsetController) SceneWindowRootViewBinder.bind( @@ -54,7 +52,6 @@ class SceneWindowRootView(context: Context, attrs: AttributeSet?) : WindowRootVi }, dataSourceDelegator = sceneDataSourceDelegator, qsSceneAdapter = qsSceneAdapter, - alternateBouncerDependencies = alternateBouncerDependencies, ) } diff --git a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt index 1c15c74d5631..f7061d9af961 100644 --- a/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/scene/ui/view/SceneWindowRootViewBinder.kt @@ -36,15 +36,12 @@ import com.android.internal.policy.ScreenDecorationsUtils import com.android.systemui.common.ui.compose.windowinsets.CutoutLocation import com.android.systemui.common.ui.compose.windowinsets.DisplayCutout import com.android.systemui.common.ui.compose.windowinsets.ScreenDecorProvider -import com.android.systemui.keyguard.ui.composable.AlternateBouncer -import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerDependencies import com.android.systemui.lifecycle.WindowLifecycleState import com.android.systemui.lifecycle.repeatWhenAttached import com.android.systemui.lifecycle.setSnapshotBinding import com.android.systemui.lifecycle.viewModel import com.android.systemui.qs.ui.adapter.QSSceneAdapter import com.android.systemui.res.R -import com.android.systemui.scene.shared.flag.SceneContainerFlag import com.android.systemui.scene.shared.model.SceneContainerConfig import com.android.systemui.scene.shared.model.SceneDataSourceDelegator import com.android.systemui.scene.ui.composable.Overlay @@ -77,7 +74,6 @@ object SceneWindowRootViewBinder { onVisibilityChangedInternal: (isVisible: Boolean) -> Unit, dataSourceDelegator: SceneDataSourceDelegator, qsSceneAdapter: Provider<QSSceneAdapter>, - alternateBouncerDependencies: AlternateBouncerDependencies, ) { val unsortedSceneByKey: Map<SceneKey, Scene> = scenes.associateBy { scene -> scene.key } val sortedSceneByKey: Map<SceneKey, Scene> = @@ -148,20 +144,10 @@ object SceneWindowRootViewBinder { // the SceneContainerView. This SharedNotificationContainer should contain NSSL // due to the NotificationStackScrollLayoutSection (legacy) or // NotificationSection (scene container) moving it there. - if (SceneContainerFlag.isEnabled) { - (sharedNotificationContainer.parent as? ViewGroup)?.removeView( - sharedNotificationContainer - ) - view.addView(sharedNotificationContainer) - - // TODO(b/358354906): use an overlay for the alternate bouncer - view.addView( - createAlternateBouncerView( - context = view.context, - alternateBouncerDependencies = alternateBouncerDependencies, - ) - ) - } + (sharedNotificationContainer.parent as? ViewGroup)?.removeView( + sharedNotificationContainer + ) + view.addView(sharedNotificationContainer) view.setSnapshotBinding { onVisibilityChangedInternal(viewModel.isVisible) } awaitCancellation() @@ -206,17 +192,6 @@ object SceneWindowRootViewBinder { } } - private fun createAlternateBouncerView( - context: Context, - alternateBouncerDependencies: AlternateBouncerDependencies, - ): ComposeView { - return ComposeView(context).apply { - setContent { - AlternateBouncer(alternateBouncerDependencies = alternateBouncerDependencies) - } - } - } - // TODO(b/298525212): remove once Compose exposes window inset bounds. private fun displayCutoutFromWindowInsets( scope: CoroutineScope, diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java index d7463f8f0c36..9ee99e45ceeb 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingController.java @@ -23,6 +23,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.media.projection.StopReason; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Process; @@ -58,6 +59,7 @@ public class RecordingController private boolean mIsStarting; private boolean mIsRecording; private PendingIntent mStopIntent; + private @StopReason int mStopReason = StopReason.STOP_UNKNOWN; private final Bundle mInteractiveBroadcastOption; private CountDownTimer mCountDownTimer = null; private final Executor mMainExecutor; @@ -83,7 +85,7 @@ public class RecordingController new UserTracker.Callback() { @Override public void onUserChanged(int newUser, @NonNull Context userContext) { - stopRecording(); + stopRecording(StopReason.STOP_USER_SWITCH); } }; @@ -240,9 +242,11 @@ public class RecordingController } /** - * Stop the recording + * Stop the recording and sets the stop reason to be used by the RecordingService + * @param stopReason the method of the recording stopped (i.e. QS tile, status bar chip, etc.) */ - public void stopRecording() { + public void stopRecording(@StopReason int stopReason) { + mStopReason = stopReason; try { if (mStopIntent != null) { mRecordingControllerLogger.logRecordingStopped(); @@ -277,6 +281,10 @@ public class RecordingController } } + public @StopReason int getStopReason() { + return mStopReason; + } + @Override public void addCallback(@NonNull RecordingStateChangeCallback listener) { mListeners.add(listener); diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java index 8c207d13d50e..f7b52719a4f4 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Icon; import android.media.MediaRecorder; +import android.media.projection.StopReason; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -78,6 +79,7 @@ public class RecordingService extends Service implements ScreenMediaRecorderList private static final String EXTRA_SHOW_TAPS = "extra_showTaps"; private static final String EXTRA_CAPTURE_TARGET = "extra_captureTarget"; private static final String EXTRA_DISPLAY_ID = "extra_displayId"; + private static final String EXTRA_STOP_REASON = "extra_stopReason"; protected static final String ACTION_START = "com.android.systemui.screenrecord.START"; protected static final String ACTION_SHOW_START_NOTIF = @@ -242,7 +244,8 @@ public class RecordingService extends Service implements ScreenMediaRecorderList // Check user ID - we may be getting a stop intent after user switch, in which case // we want to post the notifications for that user, which is NOT current user int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, USER_ID_NOT_SPECIFIED); - stopService(userId); + int stopReason = intent.getIntExtra(EXTRA_STOP_REASON, mController.getStopReason()); + stopService(userId, stopReason); break; case ACTION_SHARE: @@ -486,11 +489,11 @@ public class RecordingService extends Service implements ScreenMediaRecorderList getTag(), notificationIdForGroup, groupNotif, currentUser); } - private void stopService() { - stopService(USER_ID_NOT_SPECIFIED); + private void stopService(@StopReason int stopReason) { + stopService(USER_ID_NOT_SPECIFIED, stopReason); } - private void stopService(int userId) { + private void stopService(int userId, @StopReason int stopReason) { if (userId == USER_ID_NOT_SPECIFIED) { userId = mUserContextTracker.getUserContext().getUserId(); } @@ -499,7 +502,7 @@ public class RecordingService extends Service implements ScreenMediaRecorderList setTapsVisible(mOriginalShowTaps); try { if (getRecorder() != null) { - getRecorder().end(); + getRecorder().end(stopReason); } saveRecording(userId); } catch (RuntimeException exception) { @@ -598,7 +601,8 @@ public class RecordingService extends Service implements ScreenMediaRecorderList * @return */ protected Intent getNotificationIntent(Context context) { - return new Intent(context, this.getClass()).setAction(ACTION_STOP_NOTIF); + return new Intent(context, this.getClass()).setAction(ACTION_STOP_NOTIF) + .putExtra(EXTRA_STOP_REASON, StopReason.STOP_HOST_APP); } private Intent getShareIntent(Context context, Uri path) { @@ -610,14 +614,17 @@ public class RecordingService extends Service implements ScreenMediaRecorderList @Override public void onInfo(MediaRecorder mr, int what, int extra) { Log.d(getTag(), "Media recorder info: " + what); - onStartCommand(getStopIntent(this), 0, 0); + // Stop due to record reaching size limits so log as stopping due to error + Intent stopIntent = getStopIntent(this); + stopIntent.putExtra(EXTRA_STOP_REASON, StopReason.STOP_ERROR); + onStartCommand(stopIntent, 0, 0); } @Override - public void onStopped() { + public void onStopped(@StopReason int stopReason) { if (mController.isRecording()) { Log.d(getTag(), "Stopping recording because the system requested the stop"); - stopService(); + stopService(stopReason); } } } diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java index 2ca0621635a7..f4455bfb7048 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenMediaRecorder.java @@ -41,6 +41,7 @@ import android.media.projection.IMediaProjection; import android.media.projection.IMediaProjectionManager; import android.media.projection.MediaProjection; import android.media.projection.MediaProjectionManager; +import android.media.projection.StopReason; import android.net.Uri; import android.os.Handler; import android.os.IBinder; @@ -300,7 +301,7 @@ public class ScreenMediaRecorder extends MediaProjection.Callback { /** * End screen recording, throws an exception if stopping recording failed */ - void end() throws IOException { + void end(@StopReason int stopReason) throws IOException { Closer closer = new Closer(); // MediaRecorder might throw RuntimeException if stopped immediately after starting @@ -309,7 +310,17 @@ public class ScreenMediaRecorder extends MediaProjection.Callback { closer.register(mMediaRecorder::release); closer.register(mInputSurface::release); closer.register(mVirtualDisplay::release); - closer.register(mMediaProjection::stop); + closer.register(() -> { + if (stopReason == StopReason.STOP_UNKNOWN) { + // Attempt to call MediaProjection#stop() even if it might have already been called. + // If projection has already been stopped, then nothing will happen. Else, stop + // will be logged as a manually requested stop from host app. + mMediaProjection.stop(); + } else { + // In any other case, the stop reason is related to the recorder, so pass it on here + mMediaProjection.stop(stopReason); + } + }); closer.register(this::stopInternalAudioRecording); closer.close(); @@ -323,7 +334,7 @@ public class ScreenMediaRecorder extends MediaProjection.Callback { @Override public void onStop() { Log.d(TAG, "The system notified about stopping the projection"); - mListener.onStopped(); + mListener.onStopped(StopReason.STOP_UNKNOWN); } private void stopInternalAudioRecording() { @@ -453,7 +464,7 @@ public class ScreenMediaRecorder extends MediaProjection.Callback { * For example, this might happen when doing partial screen sharing of an app * and the app that is being captured is closed. */ - void onStopped(); + void onStopped(@StopReason int stopReason); } /** diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt index eb568f73a854..1da4c1d9469d 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionDialogDelegate.kt @@ -21,7 +21,6 @@ import android.app.PendingIntent import android.content.Context import android.content.Intent import android.hardware.display.DisplayManager -import android.os.Build import android.os.Bundle import android.os.Handler import android.os.Looper @@ -30,8 +29,6 @@ import android.os.UserHandle import android.view.Display import android.view.MotionEvent.ACTION_MOVE import android.view.View -import android.view.View.GONE -import android.view.View.VISIBLE import android.view.accessibility.AccessibilityNodeInfo import android.widget.AdapterView import android.widget.ArrayAdapter @@ -44,10 +41,10 @@ import com.android.systemui.mediaprojection.MediaProjectionCaptureTarget import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorActivity import com.android.systemui.mediaprojection.permission.BaseMediaProjectionPermissionDialogDelegate +import com.android.systemui.mediaprojection.permission.BaseMediaProjectionPermissionViewBinder import com.android.systemui.mediaprojection.permission.ENTIRE_SCREEN import com.android.systemui.mediaprojection.permission.SINGLE_APP import com.android.systemui.mediaprojection.permission.ScreenShareMode -import com.android.systemui.mediaprojection.permission.ScreenShareOption import com.android.systemui.plugins.ActivityStarter import com.android.systemui.res.R import com.android.systemui.settings.UserContextProvider @@ -64,15 +61,15 @@ class ScreenRecordPermissionDialogDelegate( private val activityStarter: ActivityStarter, private val userContextProvider: UserContextProvider, private val onStartRecordingClicked: Runnable?, - mediaProjectionMetricsLogger: MediaProjectionMetricsLogger, + private val mediaProjectionMetricsLogger: MediaProjectionMetricsLogger, private val systemUIDialogFactory: SystemUIDialog.Factory, @ScreenShareMode defaultSelectedMode: Int, @StyleRes private val theme: Int, private val context: Context, - displayManager: DisplayManager, + private val displayManager: DisplayManager, ) : BaseMediaProjectionPermissionDialogDelegate<SystemUIDialog>( - createOptionList(displayManager), + ScreenRecordPermissionViewBinder.createOptionList(displayManager), appName = null, hostUid = hostUid, mediaProjectionMetricsLogger, @@ -119,10 +116,19 @@ class ScreenRecordPermissionDialogDelegate( } private lateinit var tapsSwitch: Switch - private lateinit var tapsView: View private lateinit var audioSwitch: Switch private lateinit var options: Spinner + override fun createViewBinder(): BaseMediaProjectionPermissionViewBinder { + return ScreenRecordPermissionViewBinder( + hostUid, + mediaProjectionMetricsLogger, + defaultSelectedMode, + displayManager, + dialog, + ) + } + override fun createDialog(): SystemUIDialog { return systemUIDialogFactory.create(this, context, theme) } @@ -133,6 +139,7 @@ class ScreenRecordPermissionDialogDelegate( dialog.setTitle(R.string.screenrecord_title) setStartButtonOnClickListener { v: View? -> onStartRecordingClicked?.run() + val selectedScreenShareOption = getSelectedScreenShareOption() if (selectedScreenShareOption.mode == ENTIRE_SCREEN) { requestScreenCapture(/* captureTarget= */ null, selectedScreenShareOption.displayId) } @@ -168,6 +175,7 @@ class ScreenRecordPermissionDialogDelegate( @SuppressLint("ClickableViewAccessibility") private fun initRecordOptionsView() { + // TODO(b/378514312): Move this function to ScreenRecordPermissionViewBinder audioSwitch = dialog.requireViewById(R.id.screenrecord_audio_switch) tapsSwitch = dialog.requireViewById(R.id.screenrecord_taps_switch) @@ -176,9 +184,6 @@ class ScreenRecordPermissionDialogDelegate( audioSwitch.setOnTouchListener { _, event -> event.action == ACTION_MOVE } tapsSwitch.setOnTouchListener { _, event -> event.action == ACTION_MOVE } - tapsView = dialog.requireViewById(R.id.show_taps) - updateTapsViewVisibility() - options = dialog.requireViewById(R.id.screen_recording_options) val a: ArrayAdapter<*> = ScreenRecordingAdapter( @@ -206,15 +211,6 @@ class ScreenRecordPermissionDialogDelegate( options.isLongClickable = false } - override fun onItemSelected(adapterView: AdapterView<*>?, view: View, pos: Int, id: Long) { - super.onItemSelected(adapterView, view, pos, id) - updateTapsViewVisibility() - } - - private fun updateTapsViewVisibility() { - tapsView.visibility = if (selectedScreenShareOption.mode == SINGLE_APP) GONE else VISIBLE - } - /** * Starts screen capture after some countdown * @@ -226,7 +222,7 @@ class ScreenRecordPermissionDialogDelegate( displayId: Int = Display.DEFAULT_DISPLAY, ) { val userContext = userContextProvider.userContext - val showTaps = selectedScreenShareOption.mode != SINGLE_APP && tapsSwitch.isChecked + val showTaps = getSelectedScreenShareOption().mode != SINGLE_APP && tapsSwitch.isChecked val audioMode = if (audioSwitch.isChecked) options.selectedItem as ScreenRecordingAudioSource else ScreenRecordingAudioSource.NONE @@ -279,81 +275,5 @@ class ScreenRecordPermissionDialogDelegate( ) private const val DELAY_MS: Long = 3000 private const val INTERVAL_MS: Long = 1000 - - private val RECORDABLE_DISPLAY_TYPES = - intArrayOf( - Display.TYPE_OVERLAY, - Display.TYPE_EXTERNAL, - Display.TYPE_INTERNAL, - Display.TYPE_WIFI, - ) - - private val filterDeviceTypeFlag: Boolean = - com.android.media.projection.flags.Flags - .mediaProjectionConnectedDisplayNoVirtualDevice() - - private fun createOptionList(displayManager: DisplayManager): List<ScreenShareOption> { - if (!com.android.media.projection.flags.Flags.mediaProjectionConnectedDisplay()) { - return listOf( - ScreenShareOption( - SINGLE_APP, - R.string.screenrecord_permission_dialog_option_text_single_app, - R.string.screenrecord_permission_dialog_warning_single_app, - startButtonText = - R.string - .media_projection_entry_generic_permission_dialog_continue_single_app, - ), - ScreenShareOption( - ENTIRE_SCREEN, - R.string.screenrecord_permission_dialog_option_text_entire_screen, - R.string.screenrecord_permission_dialog_warning_entire_screen, - startButtonText = - R.string.screenrecord_permission_dialog_continue_entire_screen, - displayId = Display.DEFAULT_DISPLAY, - displayName = Build.MODEL, - ), - ) - } - - return listOf( - ScreenShareOption( - SINGLE_APP, - R.string.screenrecord_permission_dialog_option_text_single_app, - R.string.screenrecord_permission_dialog_warning_single_app, - startButtonText = - R.string - .media_projection_entry_generic_permission_dialog_continue_single_app, - ), - ScreenShareOption( - ENTIRE_SCREEN, - R.string.screenrecord_permission_dialog_option_text_entire_screen_for_display, - R.string.screenrecord_permission_dialog_warning_entire_screen, - startButtonText = - R.string.screenrecord_permission_dialog_continue_entire_screen, - displayId = Display.DEFAULT_DISPLAY, - displayName = Build.MODEL, - ), - ) + - displayManager.displays - .filter { - it.displayId != Display.DEFAULT_DISPLAY && - (!filterDeviceTypeFlag || it.type in RECORDABLE_DISPLAY_TYPES) - } - .map { - ScreenShareOption( - ENTIRE_SCREEN, - R.string - .screenrecord_permission_dialog_option_text_entire_screen_for_display, - warningText = - R.string - .media_projection_entry_app_permission_dialog_warning_entire_screen, - startButtonText = - R.string - .media_projection_entry_app_permission_dialog_continue_entire_screen, - displayId = it.displayId, - displayName = it.name, - ) - } - } } } diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionViewBinder.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionViewBinder.kt new file mode 100644 index 000000000000..91c6b4769c99 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/ScreenRecordPermissionViewBinder.kt @@ -0,0 +1,149 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.screenrecord + +import android.annotation.SuppressLint +import android.app.AlertDialog +import android.hardware.display.DisplayManager +import android.os.Build +import android.view.Display +import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE +import com.android.systemui.mediaprojection.MediaProjectionMetricsLogger +import com.android.systemui.mediaprojection.permission.BaseMediaProjectionPermissionViewBinder +import com.android.systemui.mediaprojection.permission.ENTIRE_SCREEN +import com.android.systemui.mediaprojection.permission.SINGLE_APP +import com.android.systemui.mediaprojection.permission.ScreenShareMode +import com.android.systemui.mediaprojection.permission.ScreenShareOption +import com.android.systemui.res.R + +class ScreenRecordPermissionViewBinder( + hostUid: Int, + mediaProjectionMetricsLogger: MediaProjectionMetricsLogger, + @ScreenShareMode defaultSelectedMode: Int, + displayManager: DisplayManager, + private val dialog: AlertDialog, +) : + BaseMediaProjectionPermissionViewBinder( + createOptionList(displayManager), + appName = null, + hostUid = hostUid, + mediaProjectionMetricsLogger, + defaultSelectedMode, + dialog, + ) { + private lateinit var tapsView: View + + override fun bind() { + super.bind() + initRecordOptionsView() + } + + @SuppressLint("ClickableViewAccessibility") + private fun initRecordOptionsView() { + tapsView = dialog.requireViewById(R.id.show_taps) + updateTapsViewVisibility() + } + + override fun onItemSelected(pos: Int) { + super.onItemSelected(pos) + updateTapsViewVisibility() + } + + private fun updateTapsViewVisibility() { + tapsView.visibility = if (selectedScreenShareOption.mode == SINGLE_APP) GONE else VISIBLE + } + + companion object { + private val RECORDABLE_DISPLAY_TYPES = + intArrayOf( + Display.TYPE_OVERLAY, + Display.TYPE_EXTERNAL, + Display.TYPE_INTERNAL, + Display.TYPE_WIFI, + ) + + private val filterDeviceTypeFlag: Boolean = + com.android.media.projection.flags.Flags + .mediaProjectionConnectedDisplayNoVirtualDevice() + + fun createOptionList(displayManager: DisplayManager): List<ScreenShareOption> { + if (!com.android.media.projection.flags.Flags.mediaProjectionConnectedDisplay()) { + return listOf( + ScreenShareOption( + SINGLE_APP, + R.string.screenrecord_permission_dialog_option_text_single_app, + R.string.screenrecord_permission_dialog_warning_single_app, + startButtonText = + R.string + .media_projection_entry_generic_permission_dialog_continue_single_app, + ), + ScreenShareOption( + ENTIRE_SCREEN, + R.string.screenrecord_permission_dialog_option_text_entire_screen, + R.string.screenrecord_permission_dialog_warning_entire_screen, + startButtonText = + R.string.screenrecord_permission_dialog_continue_entire_screen, + displayId = Display.DEFAULT_DISPLAY, + displayName = Build.MODEL, + ), + ) + } + + return listOf( + ScreenShareOption( + SINGLE_APP, + R.string.screenrecord_permission_dialog_option_text_single_app, + R.string.screenrecord_permission_dialog_warning_single_app, + startButtonText = + R.string + .media_projection_entry_generic_permission_dialog_continue_single_app, + ), + ScreenShareOption( + ENTIRE_SCREEN, + R.string.screenrecord_permission_dialog_option_text_entire_screen_for_display, + R.string.screenrecord_permission_dialog_warning_entire_screen, + startButtonText = + R.string.screenrecord_permission_dialog_continue_entire_screen, + displayId = Display.DEFAULT_DISPLAY, + displayName = Build.MODEL, + ), + ) + + displayManager.displays + .filter { + it.displayId != Display.DEFAULT_DISPLAY && + (!filterDeviceTypeFlag || it.type in RECORDABLE_DISPLAY_TYPES) + } + .map { + ScreenShareOption( + ENTIRE_SCREEN, + R.string + .screenrecord_permission_dialog_option_text_entire_screen_for_display, + warningText = + R.string + .media_projection_entry_app_permission_dialog_warning_entire_screen, + startButtonText = + R.string + .media_projection_entry_app_permission_dialog_continue_entire_screen, + displayId = it.displayId, + displayName = it.name, + ) + } + } + } +} diff --git a/packages/SystemUI/src/com/android/systemui/screenrecord/data/repository/ScreenRecordRepository.kt b/packages/SystemUI/src/com/android/systemui/screenrecord/data/repository/ScreenRecordRepository.kt index 9eeb3b9576d8..b6b8ffa11495 100644 --- a/packages/SystemUI/src/com/android/systemui/screenrecord/data/repository/ScreenRecordRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/screenrecord/data/repository/ScreenRecordRepository.kt @@ -16,6 +16,7 @@ package com.android.systemui.screenrecord.data.repository +import android.media.projection.StopReason import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.screenrecord.RecordingController @@ -41,7 +42,7 @@ interface ScreenRecordRepository { val screenRecordState: Flow<ScreenRecordModel> /** Stops the recording. */ - suspend fun stopRecording() + suspend fun stopRecording(@StopReason stopReason: Int) } @SysUISingleton @@ -95,7 +96,7 @@ constructor( } } - override suspend fun stopRecording() { - withContext(bgCoroutineContext) { recordingController.stopRecording() } + override suspend fun stopRecording(@StopReason stopReason: Int) { + withContext(bgCoroutineContext) { recordingController.stopRecording(stopReason) } } } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt index 7b01c36489fb..a365b7c5e9a1 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt @@ -37,7 +37,7 @@ import com.android.systemui.Flags import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.dagger.qualifiers.Main -import com.android.systemui.screenshot.proxy.SystemUiProxy +import com.android.systemui.screenshot.proxy.ScreenshotProxy import com.android.systemui.settings.DisplayTracker import com.android.systemui.shared.system.ActivityManagerWrapper import com.android.systemui.statusbar.phone.CentralSurfaces @@ -55,7 +55,7 @@ constructor( private val activityManagerWrapper: ActivityManagerWrapper, @Application private val applicationScope: CoroutineScope, @Main private val mainDispatcher: CoroutineDispatcher, - private val systemUiProxy: SystemUiProxy, + private val screenshotProxy: ScreenshotProxy, private val displayTracker: DisplayTracker, ) { /** @@ -89,7 +89,7 @@ constructor( CentralSurfaces.SYSTEM_DIALOG_REASON_SCREENSHOT ) } - systemUiProxy.dismissKeyguard() + screenshotProxy.dismissKeyguard() var transitionOptions: ActivityOptions? = null if (transitionCoordinator?.decor?.isAttachedToWindow == true) { transitionCoordinator.startExit() @@ -127,7 +127,7 @@ constructor( private suspend fun launchCrossProfileIntent( user: UserHandle, intent: Intent, - bundle: Bundle? + bundle: Bundle?, ) { val connector = getCrossProfileConnector(user) val completion = CompletableDeferred<Unit>() diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java index 90695fa00ceb..253e3a613083 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/dagger/ScreenshotModule.java @@ -38,7 +38,7 @@ import com.android.systemui.screenshot.appclips.AppClipsScreenshotHelperService; import com.android.systemui.screenshot.appclips.AppClipsService; import com.android.systemui.screenshot.message.MessageModule; import com.android.systemui.screenshot.policy.ScreenshotPolicyModule; -import com.android.systemui.screenshot.proxy.SystemUiProxyModule; +import com.android.systemui.screenshot.proxy.ScreenshotProxyModule; import com.android.systemui.screenshot.ui.viewmodel.ScreenshotViewModel; import dagger.Binds; @@ -50,7 +50,7 @@ import dagger.multibindings.IntoMap; /** * Defines injectable resources for Screenshots */ -@Module(includes = {ScreenshotPolicyModule.class, SystemUiProxyModule.class, MessageModule.class}) +@Module(includes = {ScreenshotPolicyModule.class, ScreenshotProxyModule.class, MessageModule.class}) public abstract class ScreenshotModule { @Binds diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/DisplayContentRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/DisplayContentRepositoryImpl.kt index e9599dcb026d..ec34808459c8 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/DisplayContentRepositoryImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/data/repository/DisplayContentRepositoryImpl.kt @@ -22,21 +22,21 @@ import android.app.IActivityTaskManager import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.screenshot.data.model.DisplayContentModel import com.android.systemui.screenshot.data.model.SystemUiState -import com.android.systemui.screenshot.proxy.SystemUiProxy +import com.android.systemui.screenshot.proxy.ScreenshotProxy import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext /** * Implements DisplayTaskRepository using [IActivityTaskManager], along with [ProfileTypeRepository] - * and [SystemUiProxy]. + * and [ScreenshotProxy]. */ @SuppressLint("MissingPermission") class DisplayContentRepositoryImpl @Inject constructor( private val atmService: IActivityTaskManager, - private val systemUiProxy: SystemUiProxy, + private val screenshotProxy: ScreenshotProxy, @Background private val background: CoroutineDispatcher, ) : DisplayContentRepository { @@ -53,8 +53,8 @@ constructor( ): DisplayContentModel { return DisplayContentModel( displayId, - SystemUiState(systemUiProxy.isNotificationShadeExpanded()), - rootTasks + SystemUiState(screenshotProxy.isNotificationShadeExpanded()), + rootTasks, ) } } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/IOnDoneCallback.aidl b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/IOnDoneCallback.aidl index e15030f78234..fb97fa71480b 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/IOnDoneCallback.aidl +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/IOnDoneCallback.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.screenshot; +package com.android.systemui.screenshot.proxy; interface IOnDoneCallback { void onDone(boolean success); diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/IScreenshotProxy.aidl b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/IScreenshotProxy.aidl index d2e3fbd65762..7b2f7e699521 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/IScreenshotProxy.aidl +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/IScreenshotProxy.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.screenshot; +package com.android.systemui.screenshot.proxy; -import com.android.systemui.screenshot.IOnDoneCallback; +import com.android.systemui.screenshot.proxy.IOnDoneCallback; /** Interface implemented by ScreenshotProxyService */ interface IScreenshotProxy { diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxy.kt b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxy.kt index e3eb3c4de80a..b44168f70ce3 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxy.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxy.kt @@ -24,7 +24,7 @@ package com.android.systemui.screenshot.proxy * * TODO: Rename and relocate 'ScreenshotProxyService' to this package and remove duplicate clients. */ -interface SystemUiProxy { +interface ScreenshotProxy { /** Indicate if the notification shade is "open"... (not in the fully collapsed position) */ suspend fun isNotificationShadeExpanded(): Boolean diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxyClient.kt b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyClient.kt index dcf58bde5f70..1158e2eb0ae5 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxyClient.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyClient.kt @@ -22,9 +22,6 @@ import android.content.Intent import android.util.Log import com.android.internal.infra.ServiceConnector import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.screenshot.IOnDoneCallback -import com.android.systemui.screenshot.IScreenshotProxy -import com.android.systemui.screenshot.ScreenshotProxyService import javax.inject.Inject import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine @@ -32,8 +29,8 @@ import kotlinx.coroutines.CompletableDeferred private const val TAG = "SystemUiProxy" -/** An implementation of [SystemUiProxy] using [ScreenshotProxyService]. */ -class SystemUiProxyClient @Inject constructor(@Application context: Context) : SystemUiProxy { +/** An implementation of [ScreenshotProxy] using [ScreenshotProxyService]. */ +class ScreenshotProxyClient @Inject constructor(@Application context: Context) : ScreenshotProxy { @SuppressLint("ImplicitSamInstance") private val proxyConnector: ServiceConnector<IScreenshotProxy> = ServiceConnector.Impl( @@ -41,7 +38,7 @@ class SystemUiProxyClient @Inject constructor(@Application context: Context) : S Intent(context, ScreenshotProxyService::class.java), Context.BIND_AUTO_CREATE or Context.BIND_WAIVE_PRIORITY or Context.BIND_NOT_VISIBLE, context.userId, - IScreenshotProxy.Stub::asInterface + IScreenshotProxy.Stub::asInterface, ) override suspend fun isNotificationShadeExpanded(): Boolean = suspendCoroutine { k -> diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxyModule.kt b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyModule.kt index 4dd5cc4b55b4..797be9121ae8 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/proxy/SystemUiProxyModule.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyModule.kt @@ -18,14 +18,13 @@ package com.android.systemui.screenshot.proxy import android.app.Service import com.android.systemui.dagger.SysUISingleton -import com.android.systemui.screenshot.ScreenshotProxyService import dagger.Binds import dagger.Module import dagger.multibindings.ClassKey import dagger.multibindings.IntoMap @Module -interface SystemUiProxyModule { +interface ScreenshotProxyModule { @Binds @IntoMap @@ -34,5 +33,5 @@ interface SystemUiProxyModule { @Binds @SysUISingleton - fun bindSystemUiProxy(systemUiProxyClient: SystemUiProxyClient): SystemUiProxy + fun bindSystemUiProxy(screenshotProxyClient: ScreenshotProxyClient): ScreenshotProxy } diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotProxyService.kt b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyService.kt index 6df22f036273..a84f55268678 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotProxyService.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/proxy/ScreenshotProxyService.kt @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.screenshot + +package com.android.systemui.screenshot.proxy import android.content.Intent import android.os.IBinder @@ -67,7 +68,7 @@ constructor( null, true /* dismissShade */, true /* afterKeyguardGone */, - true /* deferred */ + true, /* deferred */ ) } diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java index 88522d559c30..3a6c250e55f1 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java @@ -172,6 +172,7 @@ import com.android.systemui.settings.brightness.domain.interactor.BrightnessMirr import com.android.systemui.shade.data.repository.FlingInfo; import com.android.systemui.shade.data.repository.ShadeRepository; import com.android.systemui.shade.domain.interactor.ShadeAnimationInteractor; +import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround; import com.android.systemui.shared.system.QuickStepContract; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.GestureRecorder; @@ -2269,7 +2270,11 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump } float getDisplayDensity() { - return mCentralSurfaces.getDisplayDensity(); + if (ShadeWindowGoesAround.isEnabled()) { + return mView.getContext().getResources().getConfiguration().densityDpi; + } else { + return mCentralSurfaces.getDisplayDensity(); + } } /** Return whether a touch is near the gesture handle at the bottom of screen */ @@ -3830,7 +3835,7 @@ public final class NotificationPanelViewController implements ShadeSurface, Dump /* screenOnFromTouch=*/ getWakefulness().isAwakeFromTapOrGesture()); // Log collapse gesture if on lock screen. if (!expand && onKeyguard) { - float displayDensity = mCentralSurfaces.getDisplayDensity(); + float displayDensity = getDisplayDensity(); int heightDp = (int) Math.abs((y - mInitialExpandY) / displayDensity); int velocityDp = (int) Math.abs(vel / displayDensity); mLockscreenGestureLogger.write(MetricsEvent.ACTION_LS_UNLOCK, heightDp, velocityDp); diff --git a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java index 41d56c51fe77..69b3cc8cf4f4 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java @@ -38,10 +38,10 @@ import android.view.IWindowSession; import android.view.View; import android.view.ViewGroup; import android.view.WindowInsets; +import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.view.WindowManagerGlobal; -import com.android.app.viewcapture.ViewCaptureAwareWindowManager; import com.android.internal.annotations.VisibleForTesting; import com.android.systemui.Dumpable; import com.android.systemui.Flags; @@ -102,11 +102,12 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW private final Context mContext; private final WindowRootViewComponent.Factory mWindowRootViewComponentFactory; - private final ViewCaptureAwareWindowManager mWindowManager; + private final WindowManager mWindowManager; private final IActivityManager mActivityManager; private final DozeParameters mDozeParameters; private final KeyguardStateController mKeyguardStateController; private final ShadeWindowLogger mLogger; + private final LayoutParams mShadeWindowLayoutParams; private final LayoutParams mLpChanged; private final long mLockScreenDisplayTimeout; private final float mKeyguardPreferredRefreshRate; // takes precedence over max @@ -148,7 +149,7 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW public NotificationShadeWindowControllerImpl( @ShadeDisplayAware Context context, WindowRootViewComponent.Factory windowRootViewComponentFactory, - ViewCaptureAwareWindowManager viewCaptureAwareWindowManager, + @ShadeDisplayAware WindowManager windowManager, IActivityManager activityManager, DozeParameters dozeParameters, StatusBarStateController statusBarStateController, @@ -167,14 +168,16 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW UserTracker userTracker, NotificationShadeWindowModel notificationShadeWindowModel, SecureSettings secureSettings, - Lazy<CommunalInteractor> communalInteractor) { + Lazy<CommunalInteractor> communalInteractor, + @ShadeDisplayAware LayoutParams shadeWindowLayoutParams) { mContext = context; mWindowRootViewComponentFactory = windowRootViewComponentFactory; - mWindowManager = viewCaptureAwareWindowManager; + mWindowManager = windowManager; mActivityManager = activityManager; mDozeParameters = dozeParameters; mKeyguardStateController = keyguardStateController; mLogger = logger; + mShadeWindowLayoutParams = shadeWindowLayoutParams; mScreenBrightnessDoze = mDozeParameters.getScreenBrightnessDoze(); mLpChanged = new LayoutParams(); mKeyguardViewMediator = keyguardViewMediator; @@ -271,7 +274,9 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW // Now that the notification shade encompasses the sliding panel and its // translucent backdrop, the entire thing is made TRANSLUCENT and is // hardware-accelerated. - mLp = ShadeWindowLayoutParams.INSTANCE.create(mContext); + // mLP is assigned here (instead of the constructor) as its null value is also used to check + // if the shade window has been attached. + mLp = mShadeWindowLayoutParams; mWindowManager.addView(mWindowRootView, mLp); // We use BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE here, however, there is special logic in diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeDisplayAwareModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeDisplayAwareModule.kt index 2cfce6823015..ff39a3ddc17c 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeDisplayAwareModule.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeDisplayAwareModule.kt @@ -20,6 +20,7 @@ import android.content.Context import android.content.res.Resources import android.view.LayoutInflater import android.view.WindowManager +import android.view.WindowManager.LayoutParams import android.view.WindowManager.LayoutParams.TYPE_NOTIFICATION_SHADE import com.android.systemui.CoreStartable import com.android.systemui.common.ui.ConfigurationState @@ -80,6 +81,13 @@ object ShadeDisplayAwareModule { @Provides @ShadeDisplayAware @SysUISingleton + fun provideShadeWindowLayoutParams(@ShadeDisplayAware context: Context): LayoutParams { + return ShadeWindowLayoutParams.create(context) + } + + @Provides + @ShadeDisplayAware + @SysUISingleton fun provideShadeWindowManager( defaultWindowManager: WindowManager, @ShadeDisplayAware context: Context, diff --git a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt index 15b22700072f..8937ce33cd38 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ShadeViewProviderModule.kt @@ -33,7 +33,6 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.flags.FeatureFlags import com.android.systemui.keyguard.ui.view.KeyguardRootView -import com.android.systemui.keyguard.ui.viewmodel.AlternateBouncerDependencies import com.android.systemui.privacy.OngoingPrivacyChip import com.android.systemui.qs.ui.adapter.QSSceneAdapter import com.android.systemui.res.R @@ -91,7 +90,6 @@ abstract class ShadeViewProviderModule { layoutInsetController: NotificationInsetsController, sceneDataSourceDelegator: Provider<SceneDataSourceDelegator>, qsSceneAdapter: Provider<QSSceneAdapter>, - alternateBouncerDependencies: Provider<AlternateBouncerDependencies>, ): WindowRootView { return if (SceneContainerFlag.isEnabled) { checkNoSceneDuplicates(scenesProvider.get()) @@ -107,7 +105,6 @@ abstract class ShadeViewProviderModule { layoutInsetController = layoutInsetController, sceneDataSourceDelegator = sceneDataSourceDelegator.get(), qsSceneAdapter = qsSceneAdapter, - alternateBouncerDependencies = alternateBouncerDependencies.get(), ) sceneWindowRootView } else { diff --git a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractor.kt b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractor.kt index fb2cbec84236..34148671cf2a 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractor.kt @@ -19,6 +19,7 @@ package com.android.systemui.shade.domain.interactor import android.content.Context import android.util.Log import android.view.WindowManager +import android.view.WindowManager.LayoutParams import androidx.annotation.UiThread import com.android.app.tracing.coroutines.launchTraced import com.android.app.tracing.traceSection @@ -28,7 +29,6 @@ import com.android.systemui.dagger.qualifiers.Background import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.scene.ui.view.WindowRootView import com.android.systemui.shade.ShadeDisplayAware -import com.android.systemui.shade.ShadeWindowLayoutParams import com.android.systemui.shade.data.repository.ShadeDisplaysRepository import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround import com.android.systemui.util.kotlin.getOrNull @@ -46,14 +46,12 @@ constructor( optionalShadeRootView: Optional<WindowRootView>, private val shadePositionRepository: ShadeDisplaysRepository, @ShadeDisplayAware private val shadeContext: Context, + @ShadeDisplayAware private val shadeLayoutParams: LayoutParams, @ShadeDisplayAware private val wm: WindowManager, @Background private val bgScope: CoroutineScope, @Main private val mainThreadContext: CoroutineContext, ) : CoreStartable { - private val shadeLayoutParams: WindowManager.LayoutParams = - ShadeWindowLayoutParams.create(shadeContext) - private val shadeRootView = optionalShadeRootView.getOrNull() ?: error( diff --git a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt index dd1b58c47b63..c6752f867183 100644 --- a/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt +++ b/packages/SystemUI/src/com/android/systemui/shade/ui/viewmodel/ShadeUserActions.kt @@ -30,8 +30,8 @@ fun singleShadeActions( isDownFromTopEdgeEnabled: Boolean = true, requireTwoPointersForTopEdgeForQs: Boolean = false, ): Array<Pair<UserAction, UserActionResult>> { - val shadeUserActionResult = UserActionResult(Scenes.Shade, isIrreversible = true) - val qsSceneUserActionResult = UserActionResult(Scenes.QuickSettings, isIrreversible = true) + val shadeUserActionResult = UserActionResult(Scenes.Shade) + val qsSceneUserActionResult = UserActionResult(Scenes.QuickSettings) return buildList { // Swiping down, not from the edge, always goes to shade. add(Swipe.Down to shadeUserActionResult) @@ -53,7 +53,7 @@ fun singleShadeActions( /** Returns collection of [UserAction] to [UserActionResult] pairs for opening the split shade. */ fun splitShadeActions(): Array<Pair<UserAction, UserActionResult>> { - val shadeUserActionResult = UserActionResult(Scenes.Shade, ToSplitShade, isIrreversible = true) + val shadeUserActionResult = UserActionResult(Scenes.Shade, ToSplitShade) return arrayOf( // Swiping down, not from the edge, always goes to shade. Swipe.Down to shadeUserActionResult, @@ -66,10 +66,8 @@ fun splitShadeActions(): Array<Pair<UserAction, UserActionResult>> { /** Returns collection of [UserAction] to [UserActionResult] pairs for opening the dual shade. */ fun dualShadeActions(): Array<Pair<UserAction, UserActionResult>> { - val notifShadeUserActionResult = - UserActionResult.ShowOverlay(Overlays.NotificationsShade, isIrreversible = true) - val qsShadeuserActionResult = - UserActionResult.ShowOverlay(Overlays.QuickSettingsShade, isIrreversible = true) + val notifShadeUserActionResult = UserActionResult.ShowOverlay(Overlays.NotificationsShade) + val qsShadeuserActionResult = UserActionResult.ShowOverlay(Overlays.QuickSettingsShade) return arrayOf( Swipe.Down to notifShadeUserActionResult, Swipe.Down(fromSource = SceneContainerEdge.TopRight) to qsShadeuserActionResult, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractor.kt index bb0467f10e16..2eae3eb4fc19 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractor.kt @@ -23,6 +23,8 @@ import com.android.systemui.log.core.LogLevel import com.android.systemui.statusbar.chips.StatusBarChipLogTags.pad import com.android.systemui.statusbar.chips.StatusBarChipsLog import com.android.systemui.statusbar.phone.ongoingcall.data.repository.OngoingCallRepository +import com.android.systemui.statusbar.phone.ongoingcall.domain.interactor.OngoingCallInteractor +import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel import javax.inject.Inject import kotlinx.coroutines.CoroutineScope @@ -37,17 +39,30 @@ class CallChipInteractor @Inject constructor( @Application private val scope: CoroutineScope, + ongoingCallInteractor: OngoingCallInteractor, repository: OngoingCallRepository, @StatusBarChipsLog private val logger: LogBuffer, ) { val ongoingCallState: StateFlow<OngoingCallModel> = - repository.ongoingCallState + (if (StatusBarChipsModernization.isEnabled) + ongoingCallInteractor.ongoingCallState + else + repository.ongoingCallState) .onEach { - logger.log(TAG, LogLevel.INFO, { str1 = it::class.simpleName }, { "State: $str1" }) + logger.log( + TAG, + LogLevel.INFO, + { str1 = it::class.simpleName }, + { "State: $str1" } + ) } - .stateIn(scope, SharingStarted.Lazily, OngoingCallModel.NoCall) + .stateIn( + scope, + SharingStarted.Lazily, + OngoingCallModel.NoCall + ) companion object { private val TAG = "OngoingCall".pad() } -} +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModel.kt index b8cdd2587774..6f491e7beec8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModel.kt @@ -59,7 +59,8 @@ constructor( interactor.ongoingCallState .map { state -> when (state) { - is OngoingCallModel.NoCall -> OngoingActivityChipModel.Hidden() + is OngoingCallModel.NoCall, + is OngoingCallModel.InCallWithVisibleApp -> OngoingActivityChipModel.Hidden() is OngoingCallModel.InCall -> { val icon = if ( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/domain/interactor/MediaRouterChipInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/domain/interactor/MediaRouterChipInteractor.kt index b3dbf299e7cc..229cef910c6e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/domain/interactor/MediaRouterChipInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/casttootherdevice/domain/interactor/MediaRouterChipInteractor.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.chips.casttootherdevice.domain.interactor +import android.media.projection.StopReason import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.log.LogBuffer @@ -65,7 +66,9 @@ constructor( /** Stops the currently active MediaRouter cast. */ fun stopCasting() { - activeCastDevice.value?.let { mediaRouterRepository.stopCasting(it) } + activeCastDevice.value?.let { + mediaRouterRepository.stopCasting(it, StopReason.STOP_PRIVACY_CHIP) + } } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractor.kt index 087b51032fcf..c57c807360b1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/interactor/SingleNotificationChipInteractor.kt @@ -105,7 +105,7 @@ constructor( } return null } - return NotificationChipModel(key, statusBarChipIconView) + return NotificationChipModel(key, statusBarChipIconView, whenTime) } @AssistedFactory diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/model/NotificationChipModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/model/NotificationChipModel.kt index 5698ee6d1917..bc4241d9bca5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/model/NotificationChipModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/domain/model/NotificationChipModel.kt @@ -19,4 +19,8 @@ package com.android.systemui.statusbar.chips.notification.domain.model import com.android.systemui.statusbar.StatusBarIconView /** Modeling all the data needed to render a status bar notification chip. */ -data class NotificationChipModel(val key: String, val statusBarChipIconView: StatusBarIconView) +data class NotificationChipModel( + val key: String, + val statusBarChipIconView: StatusBarIconView, + val whenTime: Long, +) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt index 9eff627c8714..b2f7e2fe7660 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModel.kt @@ -63,9 +63,13 @@ constructor( ) } } - return OngoingActivityChipModel.Shown.IconOnly(icon, colors, onClickListener) + return OngoingActivityChipModel.Shown.ShortTimeDelta( + icon, + colors, + time = this.whenTime, + onClickListener, + ) // TODO(b/364653005): Use Notification.showWhen to determine if we should show the time. - // TODO(b/364653005): If Notification.whenTime is in the past, show "ago" in the text. // TODO(b/364653005): If Notification.shortCriticalText is set, use that instead of `when`. // TODO(b/364653005): If the app that posted the notification is in the foreground, don't // show that app's chip. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/domain/interactor/ScreenRecordChipInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/domain/interactor/ScreenRecordChipInteractor.kt index f5952f4804fc..0b5e669b5fca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/domain/interactor/ScreenRecordChipInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/screenrecord/domain/interactor/ScreenRecordChipInteractor.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.chips.screenrecord.domain.interactor +import android.media.projection.StopReason import com.android.systemui.Flags import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application @@ -140,7 +141,7 @@ constructor( /** Stops the recording. */ fun stopRecording() { - scope.launch { screenRecordRepository.stopRecording() } + scope.launch { screenRecordRepository.stopRecording(StopReason.STOP_PRIVACY_CHIP) } } companion object { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt index f4462a434477..730784a46001 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/chips/ui/binder/OngoingActivityChipBinder.kt @@ -192,10 +192,14 @@ object OngoingActivityChipBinder { } is OngoingActivityChipModel.Shown.ShortTimeDelta -> { chipShortTimeDeltaView.setTime(chipModel.time) - // TODO(b/364653005): DateTimeView's relative time doesn't quite match the format we - // want in the status bar chips. - chipShortTimeDeltaView.isShowRelativeTime = true chipShortTimeDeltaView.visibility = View.VISIBLE + chipShortTimeDeltaView.isShowRelativeTime = true + chipShortTimeDeltaView.setRelativeTimeDisambiguationTextMask( + DateTimeView.DISAMBIGUATION_TEXT_PAST + ) + chipShortTimeDeltaView.setRelativeTimeUnitDisplayLength( + DateTimeView.UNIT_DISPLAY_LENGTH_MEDIUM + ) chipTextView.visibility = View.GONE chipTimeView.hide() diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt index 47b695e50a0e..2588c7ae2363 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/dagger/StatusBarModule.kt @@ -36,6 +36,7 @@ import com.android.systemui.statusbar.phone.StatusBarContentInsetsProviderImpl import com.android.systemui.statusbar.phone.StatusBarSignalPolicy import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallLog +import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.statusbar.ui.SystemBarUtilsProxyImpl import com.android.systemui.statusbar.window.MultiDisplayStatusBarWindowControllerStore @@ -63,11 +64,6 @@ interface StatusBarModule { @Binds @IntoMap - @ClassKey(OngoingCallController::class) - fun bindOngoingCallController(impl: OngoingCallController): CoreStartable - - @Binds - @IntoMap @ClassKey(LightBarController::class) fun lightBarControllerAsCoreStartable(controller: LightBarController): CoreStartable @@ -90,6 +86,18 @@ interface StatusBarModule { ): LightBarController.Factory companion object { + @Provides + @SysUISingleton + @IntoMap + @ClassKey(OngoingCallController::class) + fun ongoingCallController( + controller: OngoingCallController + ): CoreStartable = + if (StatusBarChipsModernization.isEnabled) { + CoreStartable.NOP + } else { + controller + } @Provides @SysUISingleton diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/AssistantFeedbackController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/AssistantFeedbackController.java index 24088d2dabfa..11ec2edb36f6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/AssistantFeedbackController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/AssistantFeedbackController.java @@ -30,6 +30,7 @@ import androidx.annotation.Nullable; import com.android.internal.R; import com.android.systemui.dagger.SysUISingleton; +import com.android.systemui.dagger.qualifiers.Application; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.statusbar.notification.collection.NotificationEntry; import com.android.systemui.util.DeviceConfigProxy; @@ -72,7 +73,7 @@ public class AssistantFeedbackController { /** Injected constructor */ @Inject public AssistantFeedbackController(@Main Handler handler, - Context context, DeviceConfigProxy proxy) { + @Application Context context, DeviceConfigProxy proxy) { mHandler = handler; mContext = context; mDeviceConfigProxy = proxy; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt index 0569074c88b2..91864c226964 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationSectionsFeatureManager.kt @@ -18,13 +18,14 @@ package com.android.systemui.statusbar.notification import android.content.Context import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.util.Utils import javax.inject.Inject @SysUISingleton class NotificationSectionsFeatureManager @Inject -constructor(val context: Context) { +constructor(@ShadeDisplayAware val context: Context) { fun isMediaControlsEnabled(): Boolean { return Utils.useQsMediaPlayer(context) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolver.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolver.kt index 0c49713131e8..0f08ae407d2e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolver.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolver.kt @@ -23,35 +23,37 @@ import android.content.pm.PackageManager import android.service.notification.StatusBarNotification import android.util.Log import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection import com.android.systemui.statusbar.notification.collection.notifcollection.NotifCollectionListener import com.android.systemui.statusbar.phone.CentralSurfaces import javax.inject.Inject @SysUISingleton -class TargetSdkResolver @Inject constructor( - private val context: Context -) { +class TargetSdkResolver @Inject constructor(@Application private val context: Context) { fun initialize(collection: CommonNotifCollection) { - collection.addCollectionListener(object : NotifCollectionListener { - override fun onEntryBind(entry: NotificationEntry, sbn: StatusBarNotification) { - entry.targetSdk = resolveNotificationSdk(sbn) + collection.addCollectionListener( + object : NotifCollectionListener { + override fun onEntryBind(entry: NotificationEntry, sbn: StatusBarNotification) { + entry.targetSdk = resolveNotificationSdk(sbn) + } } - }) + ) } private fun resolveNotificationSdk(sbn: StatusBarNotification): Int { - val applicationInfo = getApplicationInfoFromExtras(sbn.notification) + val applicationInfo = + getApplicationInfoFromExtras(sbn.notification) ?: getApplicationInfoFromPackageManager(sbn) return applicationInfo?.targetSdkVersion ?: 0 } private fun getApplicationInfoFromExtras(notification: Notification): ApplicationInfo? = - notification.extras.getParcelable( - Notification.EXTRA_BUILDER_APPLICATION_INFO, - ApplicationInfo::class.java - ) + notification.extras.getParcelable( + Notification.EXTRA_BUILDER_APPLICATION_INFO, + ApplicationInfo::class.java, + ) private fun getApplicationInfoFromPackageManager(sbn: StatusBarNotification): ApplicationInfo? { val pmUser = CentralSurfaces.getPackageManagerForUser(context, sbn.user.identifier) 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 e75c11de57c7..3c31d893cf72 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 @@ -46,6 +46,7 @@ import com.android.systemui.statusbar.notification.collection.provider.VisualSta import com.android.systemui.statusbar.notification.domain.interactor.SeenNotificationsInteractor; import com.android.systemui.statusbar.notification.shared.NotificationMinimalism; import com.android.systemui.statusbar.notification.headsup.HeadsUpManager; +import com.android.systemui.statusbar.policy.KeyguardStateController; import com.android.systemui.util.concurrency.DelayableExecutor; import com.android.systemui.util.kotlin.BooleanFlowOperators; import com.android.systemui.util.kotlin.JavaAdapter; @@ -78,6 +79,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { private final CommunalSceneInteractor mCommunalSceneInteractor; private final ShadeInteractor mShadeInteractor; private final KeyguardTransitionInteractor mKeyguardTransitionInteractor; + private final KeyguardStateController mKeyguardStateController; private final VisualStabilityCoordinatorLogger mLogger; private boolean mSleepy = true; @@ -120,6 +122,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { CommunalSceneInteractor communalSceneInteractor, ShadeInteractor shadeInteractor, KeyguardTransitionInteractor keyguardTransitionInteractor, + KeyguardStateController keyguardStateController, VisualStabilityCoordinatorLogger logger) { mHeadsUpManager = headsUpManager; mShadeAnimationInteractor = shadeAnimationInteractor; @@ -133,6 +136,7 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { mCommunalSceneInteractor = communalSceneInteractor; mShadeInteractor = shadeInteractor; mKeyguardTransitionInteractor = keyguardTransitionInteractor; + mKeyguardStateController = keyguardStateController; mLogger = logger; dumpManager.registerDumpable(this); @@ -162,17 +166,29 @@ public class VisualStabilityCoordinator implements Coordinator, Dumpable { KeyguardState.LOCKSCREEN), this::onLockscreenKeyguardStateTransitionValueChanged); } + if (Flags.checkLockscreenGoneTransition()) { - mJavaAdapter.alwaysCollectFlow(mKeyguardTransitionInteractor.isInTransition( - Edge.create(KeyguardState.LOCKSCREEN, Scenes.Gone), - Edge.create(KeyguardState.LOCKSCREEN, KeyguardState.GONE)), - this::onLockscreenInGoneTransitionChanged); + if (SceneContainerFlag.isEnabled()) { + mJavaAdapter.alwaysCollectFlow(mKeyguardTransitionInteractor.isInTransition( + Edge.create(KeyguardState.LOCKSCREEN, Scenes.Gone), null), + this::onLockscreenInGoneTransitionChanged); + } else { + mKeyguardStateController.addCallback(mKeyguardFadeAwayAnimationCallback); + } } - pipeline.setVisualStabilityManager(mNotifStabilityManager); } + final KeyguardStateController.Callback mKeyguardFadeAwayAnimationCallback = + new KeyguardStateController.Callback() { + @Override + public void onKeyguardFadingAwayChanged() { + onLockscreenInGoneTransitionChanged( + mKeyguardStateController.isKeyguardFadingAway()); + } + }; + // TODO(b/203826051): Ensure stability manager can allow reordering off-screen // HUNs to the top of the shade private final NotifStabilityManager mNotifStabilityManager = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionHeaderVisibilityProvider.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionHeaderVisibilityProvider.kt index 6b70a0807b86..03b38f9a8ce3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionHeaderVisibilityProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/provider/SectionHeaderVisibilityProvider.kt @@ -17,8 +17,9 @@ package com.android.systemui.statusbar.notification.collection.provider import android.content.Context -import com.android.systemui.res.R import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import javax.inject.Inject /** @@ -31,9 +32,7 @@ import javax.inject.Inject * visibility when it invalidates, and we just store that state here.) */ @SysUISingleton -class SectionHeaderVisibilityProvider @Inject constructor( - context: Context -) { +class SectionHeaderVisibilityProvider @Inject constructor(@ShadeDisplayAware context: Context) { val neverShowSectionHeaders = context.resources.getBoolean(R.bool.config_notification_never_show_section_headers) var sectionHeadersVisible = true diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt index 70fabc0587d4..c731ac648a77 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/MediaContainerController.kt @@ -19,15 +19,16 @@ package com.android.systemui.statusbar.notification.collection.render import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.android.systemui.res.R import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.stack.MediaContainerView import javax.inject.Inject @SysUISingleton -class MediaContainerController @Inject constructor( - private val layoutInflater: LayoutInflater -) : NodeController { +class MediaContainerController +@Inject +constructor(@ShadeDisplayAware private val layoutInflater: LayoutInflater) : NodeController { override val nodeLabel = "MediaContainer" var mediaContainerView: MediaContainerView? = null @@ -42,11 +43,12 @@ class MediaContainerController @Inject constructor( parent.removeView(_view) } } - val inflated = layoutInflater.inflate( + val inflated = + layoutInflater.inflate( R.layout.keyguard_media_container, parent, - false /* attachToRoot */) - as MediaContainerView + false, /* attachToRoot */ + ) as MediaContainerView if (oldPos != -1) { parent.addView(inflated, oldPos) } @@ -57,6 +59,8 @@ class MediaContainerController @Inject constructor( get() = mediaContainerView!! override fun offerToKeepInParentForAnimation(): Boolean = false + override fun removeFromParentIfKeptForAnimation(): Boolean = false + override fun resetKeepInParentForAnimation() {} -}
\ No newline at end of file +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt index 5464d08fca67..37005c1644e0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/render/SectionHeaderController.kt @@ -21,8 +21,9 @@ import android.content.Intent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.android.systemui.res.R import com.android.systemui.plugins.ActivityStarter +import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.dagger.HeaderClickAction import com.android.systemui.statusbar.notification.dagger.HeaderText import com.android.systemui.statusbar.notification.dagger.NodeLabel @@ -32,30 +33,37 @@ import javax.inject.Inject interface SectionHeaderController { fun reinflateView(parent: ViewGroup) + val headerView: SectionHeaderView? + fun setClearSectionEnabled(enabled: Boolean) + fun setOnClearSectionClickListener(listener: View.OnClickListener) } @SectionHeaderScope -class SectionHeaderNodeControllerImpl @Inject constructor( +class SectionHeaderNodeControllerImpl +@Inject +constructor( @NodeLabel override val nodeLabel: String, - private val layoutInflater: LayoutInflater, + @ShadeDisplayAware private val layoutInflater: LayoutInflater, @HeaderText @StringRes private val headerTextResId: Int, private val activityStarter: ActivityStarter, - @HeaderClickAction private val clickIntentAction: String + @HeaderClickAction private val clickIntentAction: String, ) : NodeController, SectionHeaderController { private var _view: SectionHeaderView? = null private var clearAllButtonEnabled = false private var clearAllClickListener: View.OnClickListener? = null - private val onHeaderClickListener = View.OnClickListener { - activityStarter.startActivity( + private val onHeaderClickListener = + View.OnClickListener { + activityStarter.startActivity( Intent(clickIntentAction), true /* onlyProvisioned */, true /* dismissShade */, - Intent.FLAG_ACTIVITY_SINGLE_TOP) - } + Intent.FLAG_ACTIVITY_SINGLE_TOP, + ) + } override fun reinflateView(parent: ViewGroup) { var oldPos = -1 @@ -66,11 +74,12 @@ class SectionHeaderNodeControllerImpl @Inject constructor( parent.removeView(_view) } } - val inflated = layoutInflater.inflate( + val inflated = + layoutInflater.inflate( R.layout.status_bar_notification_section_header, parent, - false /* attachToRoot */) - as SectionHeaderView + false, /* attachToRoot */ + ) as SectionHeaderView inflated.setHeaderText(headerTextResId) inflated.setOnHeaderClickListener(onHeaderClickListener) clearAllClickListener?.let { inflated.setOnClearAllClickListener(it) } @@ -100,7 +109,10 @@ class SectionHeaderNodeControllerImpl @Inject constructor( override val view: View get() = _view!! + override fun offerToKeepInParentForAnimation(): Boolean = false + override fun removeFromParentIfKeptForAnimation(): Boolean = false + override fun resetKeepInParentForAnimation() {} } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/ActiveNotificationsInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/ActiveNotificationsInteractor.kt index cff5bef9fe69..6b93ee1c435e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/ActiveNotificationsInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/ActiveNotificationsInteractor.kt @@ -79,11 +79,10 @@ constructor( /** The notifications that are promoted and ongoing. Sorted by priority order. */ val promotedOngoingNotifications: Flow<List<ActiveNotificationModel>> = if (StatusBarNotifChips.isEnabled) { - // TODO(b/364653005): Filter all the notifications down to just the promoted ones. // TODO(b/364653005): [ongoingCallNotification] should be incorporated into this flow // instead of being separate. topLevelRepresentativeNotifications - .map { notifs -> notifs.filter { it.isPromoted } } + .map { notifs -> notifs.filter { it.promotedContent != null } } .distinctUntilChanged() .flowOn(backgroundDispatcher) } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt index 8bd7a1ab7a77..042389f7fde7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt @@ -33,7 +33,6 @@ import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.collection.provider.SectionStyleProvider import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationListRepository import com.android.systemui.statusbar.notification.data.repository.ActiveNotificationsStore -import com.android.systemui.statusbar.notification.promoted.PromotedNotificationsProvider import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel import com.android.systemui.statusbar.notification.shared.ActiveNotificationEntryModel import com.android.systemui.statusbar.notification.shared.ActiveNotificationGroupModel @@ -52,7 +51,6 @@ class RenderNotificationListInteractor constructor( private val repository: ActiveNotificationListRepository, private val sectionStyleProvider: SectionStyleProvider, - private val promotedNotificationsProvider: PromotedNotificationsProvider, ) { /** * Sets the current list of rendered notification entries as displayed in the notification list. @@ -60,11 +58,7 @@ constructor( fun setRenderedList(entries: List<ListEntry>) { traceSection("RenderNotificationListInteractor.setRenderedList") { repository.activeNotifications.update { existingModels -> - buildActiveNotificationsStore( - existingModels, - sectionStyleProvider, - promotedNotificationsProvider, - ) { + buildActiveNotificationsStore(existingModels, sectionStyleProvider) { entries.forEach(::addListEntry) setRankingsMap(entries) } @@ -76,21 +70,13 @@ constructor( private fun buildActiveNotificationsStore( existingModels: ActiveNotificationsStore, sectionStyleProvider: SectionStyleProvider, - promotedNotificationsProvider: PromotedNotificationsProvider, block: ActiveNotificationsStoreBuilder.() -> Unit, ): ActiveNotificationsStore = - ActiveNotificationsStoreBuilder( - existingModels, - sectionStyleProvider, - promotedNotificationsProvider, - ) - .apply(block) - .build() + ActiveNotificationsStoreBuilder(existingModels, sectionStyleProvider).apply(block).build() private class ActiveNotificationsStoreBuilder( private val existingModels: ActiveNotificationsStore, private val sectionStyleProvider: SectionStyleProvider, - private val promotedNotificationsProvider: PromotedNotificationsProvider, ) { private val builder = ActiveNotificationsStore.Builder() @@ -163,7 +149,6 @@ private class ActiveNotificationsStoreBuilder( key = key, groupKey = sbn.groupKey, whenTime = sbn.notification.`when`, - isPromoted = promotedNotificationsProvider.shouldPromote(this), isAmbient = sectionStyleProvider.isMinimized(this), isRowDismissed = isRowDismissed, isSilent = sectionStyleProvider.isSilent(this), @@ -190,7 +175,6 @@ private fun ActiveNotificationsStore.createOrReuse( key: String, groupKey: String?, whenTime: Long, - isPromoted: Boolean, isAmbient: Boolean, isRowDismissed: Boolean, isSilent: Boolean, @@ -215,7 +199,6 @@ private fun ActiveNotificationsStore.createOrReuse( key = key, groupKey = groupKey, whenTime = whenTime, - isPromoted = isPromoted, isAmbient = isAmbient, isRowDismissed = isRowDismissed, isSilent = isSilent, @@ -240,7 +223,6 @@ private fun ActiveNotificationsStore.createOrReuse( key = key, groupKey = groupKey, whenTime = whenTime, - isPromoted = isPromoted, isAmbient = isAmbient, isRowDismissed = isRowDismissed, isSilent = isSilent, @@ -266,7 +248,6 @@ private fun ActiveNotificationModel.isCurrent( key: String, groupKey: String?, whenTime: Long, - isPromoted: Boolean, isAmbient: Boolean, isRowDismissed: Boolean, isSilent: Boolean, @@ -290,7 +271,6 @@ private fun ActiveNotificationModel.isCurrent( key != this.key -> false groupKey != this.groupKey -> false whenTime != this.whenTime -> false - isPromoted != this.isPromoted -> false isAmbient != this.isAmbient -> false isRowDismissed != this.isRowDismissed -> false isSilent != this.isSilent -> false diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java index 99df9f45840a..0b188afa1c35 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/headsup/HeadsUpManagerImpl.java @@ -42,6 +42,7 @@ import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.plugins.statusbar.StatusBarStateController; import com.android.systemui.res.R; import com.android.systemui.scene.shared.flag.SceneContainerFlag; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.shade.domain.interactor.ShadeInteractor; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.collection.NotificationEntry; @@ -118,8 +119,7 @@ public class HeadsUpManagerImpl protected int mAutoDismissTime; protected DelayableExecutor mExecutor; - @VisibleForTesting - public final int mExtensionTime; + private final int mExtensionTime; // TODO(b/328393698) move the topHeadsUpRow logic to an interactor private final MutableStateFlow<HeadsUpRowRepository> mTopHeadsUpRow = @@ -189,7 +189,7 @@ public class HeadsUpManagerImpl KeyguardBypassController bypassController, GroupMembershipManager groupMembershipManager, VisualStabilityProvider visualStabilityProvider, - ConfigurationController configurationController, + @ShadeDisplayAware ConfigurationController configurationController, @Main Handler handler, GlobalSettings globalSettings, SystemClock systemClock, @@ -212,7 +212,8 @@ public class HeadsUpManagerImpl mVisualStabilityProvider = visualStabilityProvider; Resources resources = context.getResources(); mMinimumDisplayTime = NotificationThrottleHun.isEnabled() - ? 500 : resources.getInteger(R.integer.heads_up_notification_minimum_time); + ? resources.getInteger(R.integer.heads_up_notification_minimum_time_with_throttling) + : resources.getInteger(R.integer.heads_up_notification_minimum_time); mStickyForSomeTimeAutoDismissTime = resources.getInteger( R.integer.sticky_heads_up_notification_time); mAutoDismissTime = resources.getInteger(R.integer.heads_up_notification_decay); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerAlwaysOnDisplayViewModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerAlwaysOnDisplayViewModel.kt index 8768ea267b3f..f86ae684777f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerAlwaysOnDisplayViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewmodel/NotificationIconContainerAlwaysOnDisplayViewModel.kt @@ -18,11 +18,11 @@ package com.android.systemui.statusbar.notification.icon.ui.viewmodel import android.content.res.Resources import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Background -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor import com.android.systemui.keyguard.shared.model.KeyguardState import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.shade.domain.interactor.ShadeInteractor import com.android.systemui.statusbar.notification.icon.domain.interactor.AlwaysOnDisplayNotificationIconsInteractor import javax.inject.Inject @@ -44,17 +44,16 @@ constructor( iconsInteractor: AlwaysOnDisplayNotificationIconsInteractor, keyguardInteractor: KeyguardInteractor, keyguardTransitionInteractor: KeyguardTransitionInteractor, - @Main resources: Resources, + @ShadeDisplayAware resources: Resources, shadeInteractor: ShadeInteractor, ) { private val maxIcons = resources.getInteger(R.integer.max_notif_icons_on_aod) /** Are changes to the icon container animated? */ val areContainerChangesAnimated: Flow<Boolean> = - combine( - shadeInteractor.isShadeTouchable, - keyguardInteractor.isKeyguardVisible, - ) { panelTouchesEnabled, isKeyguardVisible -> + combine(shadeInteractor.isShadeTouchable, keyguardInteractor.isKeyguardVisible) { + panelTouchesEnabled, + isKeyguardVisible -> panelTouchesEnabled && isKeyguardVisible } .flowOn(bgContext) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt index f400d605cb43..38eaf27ad358 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/promoted/PromotedNotificationContentExtractor.kt @@ -27,6 +27,7 @@ import android.app.Notification.EXTRA_TITLE import android.app.Notification.ProgressStyle import android.content.Context import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.notification.collection.NotificationEntry import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel import com.android.systemui.statusbar.notification.promoted.shared.model.PromotedNotificationContentModel.Style @@ -38,7 +39,7 @@ class PromotedNotificationContentExtractor @Inject constructor( private val promotedNotificationsProvider: PromotedNotificationsProvider, - private val context: Context, + @ShadeDisplayAware private val context: Context, private val logger: PromotedNotificationLogger, ) { fun extractContent( diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/EnsureEnrViewsVisibility.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/EnsureEnrViewsVisibility.kt deleted file mode 100644 index aa63f4ddbd45..000000000000 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/EnsureEnrViewsVisibility.kt +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.systemui.statusbar.notification.row - -import com.android.systemui.Flags -import com.android.systemui.flags.FlagToken -import com.android.systemui.flags.RefactorFlagUtils - -/** Helper for reading or using the ensure enr views visibility flag state. */ -@Suppress("NOTHING_TO_INLINE") -object EnsureEnrViewsVisibility { - /** The aconfig flag name */ - const val FLAG_NAME = Flags.FLAG_ENSURE_ENR_VIEWS_VISIBILITY - - /** A token used for dependency declaration */ - val token: FlagToken - get() = FlagToken(FLAG_NAME, isEnabled) - - /** Is the refactor enabled */ - @JvmStatic - inline val isEnabled - get() = Flags.ensureEnrViewsVisibility() - - /** - * Called to ensure code is only run when the flag is enabled. This protects users from the - * unintended behaviors caused by accidentally running new logic, while also crashing on an eng - * build to ensure that the refactor author catches issues in testing. - */ - @JvmStatic - inline fun isUnexpectedlyInLegacyMode() = - RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME) - - /** - * Called to ensure code is only run when the flag is disabled. This will throw an exception if - * the flag is not enabled to ensure that the refactor author catches issues in testing. - * Caution!! Using this check incorrectly will cause crashes in nextfood builds! - */ - @JvmStatic - inline fun assertInNewMode() = RefactorFlagUtils.assertInNewMode(isEnabled, FLAG_NAME) - - /** - * Called to ensure code is only run when the flag is disabled. This will throw an exception if - * the flag is enabled to ensure that the refactor author catches issues in testing. - */ - @JvmStatic - inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME) -} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index 7ad65fc64735..c8811fd3b76d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -79,7 +79,6 @@ import com.android.internal.util.ContrastColorUtil; import com.android.internal.widget.CachingIconView; import com.android.internal.widget.CallLayout; import com.android.systemui.Flags; -import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.RefactorFlag; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.PluginListener; @@ -130,14 +129,12 @@ import com.android.systemui.statusbar.policy.dagger.RemoteInputViewSubcomponent; import com.android.systemui.util.Compile; import com.android.systemui.util.DumpUtilsKt; import com.android.systemui.util.ListenerSet; -import com.android.systemui.wmshell.BubblesManager; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.function.BooleanSupplier; import java.util.function.Consumer; @@ -151,7 +148,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView NotificationFadeAware.FadeOptimizedNotification { private static final String TAG = "ExpandableNotifRow"; - private static final boolean DEBUG = Compile.IS_DEBUG && Log.isLoggable(TAG, Log.DEBUG); private static final boolean DEBUG_ONMEASURE = Compile.IS_DEBUG && Log.isLoggable(TAG, Log.VERBOSE); private static final int MENU_VIEW_INDEX = 0; @@ -186,12 +182,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView private LayoutListener mLayoutListener; private RowContentBindStage mRowContentBindStage; private PeopleNotificationIdentifier mPeopleNotificationIdentifier; - private Optional<BubblesManager> mBubblesManagerOptional; private MetricsLogger mMetricsLogger; private NotificationChildrenContainerLogger mChildrenContainerLogger; private ColorUpdateLogger mColorUpdateLogger; private NotificationDismissibilityProvider mDismissibilityProvider; - private FeatureFlags mFeatureFlags; private int mIconTransformContentShift; private int mMaxHeadsUpHeightBeforeN; private int mMaxHeadsUpHeightBeforeP; @@ -342,7 +336,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView */ private boolean mIgnoreLockscreenConstraints; - private OnClickListener mExpandClickListener = new OnClickListener() { + private final OnClickListener mExpandClickListener = new OnClickListener() { @Override public void onClick(View v) { toggleExpansionState(v, /* shouldLogExpandClickMetric = */true); @@ -431,13 +425,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView @Nullable private Runnable mOnIntrinsicHeightReachedRunnable; - private float mTopRoundnessDuringLaunchAnimation; - private float mBottomRoundnessDuringLaunchAnimation; - private float mSmallRoundness; + private final float mSmallRoundness; - private ListenerSet<DismissButtonTargetVisibilityListener> - mDismissButtonTargetVisibilityListeners - = new ListenerSet(); + private final ListenerSet<DismissButtonTargetVisibilityListener> + mDismissButtonTargetVisibilityListeners = new ListenerSet<>(); public NotificationContentView[] getLayouts() { return Arrays.copyOf(mLayouts, mLayouts.length); @@ -788,7 +779,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView if (targetVisible != null) { for (DismissButtonTargetVisibilityListener listener : mDismissButtonTargetVisibilityListeners) { - listener.onTargetVisibilityChanged(targetVisible.booleanValue()); + listener.onTargetVisibilityChanged(targetVisible); } } @@ -2024,7 +2015,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView StatusBarStateController statusBarStateController, PeopleNotificationIdentifier peopleNotificationIdentifier, OnUserInteractionCallback onUserInteractionCallback, - Optional<BubblesManager> bubblesManagerOptional, NotificationGutsManager gutsManager, NotificationDismissibilityProvider dismissibilityProvider, MetricsLogger metricsLogger, @@ -2032,7 +2022,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView ColorUpdateLogger colorUpdateLogger, SmartReplyConstants smartReplyConstants, SmartReplyController smartReplyController, - FeatureFlags featureFlags, IStatusBarService statusBarService, UiEventLogger uiEventLogger) { mEntry = entry; @@ -2067,13 +2056,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView ); } mOnUserInteractionCallback = onUserInteractionCallback; - mBubblesManagerOptional = bubblesManagerOptional; mNotificationGutsManager = gutsManager; mMetricsLogger = metricsLogger; mChildrenContainerLogger = childrenContainerLogger; mColorUpdateLogger = colorUpdateLogger; mDismissibilityProvider = dismissibilityProvider; - mFeatureFlags = featureFlags; setHapticFeedbackEnabled(!Flags.msdlFeedback()); } @@ -2470,10 +2457,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView : View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS); } - public CharSequence getActiveRemoteInputText() { - return mPrivateLayout.getActiveRemoteInputText(); - } - /** * Reset the translation with an animation. */ @@ -2548,7 +2531,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView return getTranslationX(); } - if (mTranslateableViews != null && mTranslateableViews.size() > 0) { + if (mTranslateableViews != null && !mTranslateableViews.isEmpty()) { // All of the views in the list should have same translation, just use first one. return mTranslateableViews.get(0).getTranslationX(); } @@ -2603,10 +2586,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } private void updateChildrenVisibility() { - if (EnsureEnrViewsVisibility.isEnabled()) { - mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE); - } - boolean hideContentWhileLaunching = mExpandAnimationRunning && mGuts != null && mGuts.isExposed(); mPrivateLayout.setVisibility(!mShowingPublic && !mIsSummaryWithChildren @@ -2687,7 +2666,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView int clipTopAmount = (int) MathUtils.lerp(startClipTopAmount, 0, params.getProgress()); if (mNotificationParent != null) { float parentTranslationY = mNotificationParent.getTranslationY(); - top -= parentTranslationY; + top -= (int) parentTranslationY; mNotificationParent.setTranslationZ(translationZ); // When the expanding notification is below its parent, the parent must be clipped @@ -2714,9 +2693,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView float absoluteCenterX = getLocationOnScreen()[0] + getWidth() / 2f - getTranslationX(); setTranslationX(params.getCenterX() - absoluteCenterX); - final float maxRadius = getMaxRadius(); - mTopRoundnessDuringLaunchAnimation = params.getTopCornerRadius() / maxRadius; - mBottomRoundnessDuringLaunchAnimation = params.getBottomCornerRadius() / maxRadius; invalidateOutline(); mBackgroundNormal.setExpandAnimationSize(params.getWidth(), actualHeight); @@ -2926,7 +2902,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } } - @Override public int getHeightWithoutLockscreenConstraints() { mIgnoreLockscreenConstraints = true; @@ -3166,13 +3141,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView } else { mLogger.logSkipResetAllContentAlphas(getEntry()); } - - if (!EnsureEnrViewsVisibility.isEnabled()) { - // mPublicLayout.setVisibility moved to updateChildrenVisibility when the flag is on - // in order to ensure public and private views are not visible - // together at the same time. - mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE); - } + mPublicLayout.setVisibility(mShowingPublic ? View.VISIBLE : View.INVISIBLE); updateChildrenVisibility(); } else { animateShowingPublic(delay, duration, mShowingPublic); @@ -3258,7 +3227,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView notifyHeightChanged(/* needsAnimation= */ false); } - public void setChildrenExpanded(boolean expanded, boolean animate) { + public void setChildrenExpanded(boolean expanded) { mChildrenExpanded = expanded; if (mChildrenContainer != null) { mChildrenContainer.setChildrenExpanded(expanded); @@ -3910,10 +3879,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView return mEntry.getSbn().getNotification().isMediaNotification(); } - public boolean isGroupNotFullyVisible() { - return getClipTopAmount() > 0 || getTranslationY() < 0; - } - public void setAboveShelf(boolean aboveShelf) { boolean wasAboveShelf = isAboveShelf(); mAboveShelf = aboveShelf; @@ -4142,10 +4107,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView mTargetPoint = p; } - public Point getTargetPoint() { - return mTargetPoint; - } - /** Update the minimum roundness based on current state */ private void updateBaseRoundness() { if (isChildInGroup()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java index a150f7f1f54e..e06280e36bc8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowController.java @@ -35,7 +35,7 @@ import androidx.annotation.VisibleForTesting; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.UiEventLogger; import com.android.internal.statusbar.IStatusBarService; -import com.android.systemui.flags.FeatureFlags; +import com.android.systemui.flags.FeatureFlagsClassic; import com.android.systemui.flags.Flags; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.PluginManager; @@ -51,6 +51,7 @@ 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.NodeController; import com.android.systemui.statusbar.notification.collection.render.NotifViewController; +import com.android.systemui.statusbar.notification.headsup.HeadsUpManager; import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier; import com.android.systemui.statusbar.notification.row.dagger.AppName; import com.android.systemui.statusbar.notification.row.dagger.NotificationKey; @@ -59,17 +60,14 @@ import com.android.systemui.statusbar.notification.stack.NotificationChildrenCon import com.android.systemui.statusbar.notification.stack.NotificationListContainer; import com.android.systemui.statusbar.notification.stack.ui.view.NotificationRowStatsLogger; import com.android.systemui.statusbar.phone.KeyguardBypassController; -import com.android.systemui.statusbar.notification.headsup.HeadsUpManager; import com.android.systemui.statusbar.policy.SmartReplyConstants; import com.android.systemui.statusbar.policy.dagger.RemoteInputViewSubcomponent; import com.android.systemui.util.time.SystemClock; -import com.android.systemui.wmshell.BubblesManager; import com.google.android.msdl.data.model.MSDLToken; import com.google.android.msdl.domain.MSDLPlayer; import java.util.List; -import java.util.Optional; import javax.inject.Inject; import javax.inject.Named; @@ -108,10 +106,9 @@ public class ExpandableNotificationRowController implements NotifViewController private final NotificationGutsManager mNotificationGutsManager; private final OnUserInteractionCallback mOnUserInteractionCallback; private final FalsingManager mFalsingManager; - private final FeatureFlags mFeatureFlags; + private final FeatureFlagsClassic mFeatureFlags; private final boolean mAllowLongPress; private final PeopleNotificationIdentifier mPeopleNotificationIdentifier; - private final Optional<BubblesManager> mBubblesManagerOptional; private final SmartReplyConstants mSmartReplyConstants; private final SmartReplyController mSmartReplyController; private final ExpandableNotificationRowDragController mDragController; @@ -271,9 +268,8 @@ public class ExpandableNotificationRowController implements NotifViewController @Named(ALLOW_NOTIFICATION_LONG_PRESS_NAME) boolean allowLongPress, OnUserInteractionCallback onUserInteractionCallback, FalsingManager falsingManager, - FeatureFlags featureFlags, + FeatureFlagsClassic featureFlags, PeopleNotificationIdentifier peopleNotificationIdentifier, - Optional<BubblesManager> bubblesManagerOptional, NotificationSettingsController settingsController, ExpandableNotificationRowDragController dragController, NotificationDismissibilityProvider dismissibilityProvider, @@ -303,7 +299,6 @@ public class ExpandableNotificationRowController implements NotifViewController mAllowLongPress = allowLongPress; mFeatureFlags = featureFlags; mPeopleNotificationIdentifier = peopleNotificationIdentifier; - mBubblesManagerOptional = bubblesManagerOptional; mSettingsController = settingsController; mDragController = dragController; mMetricsLogger = metricsLogger; @@ -340,7 +335,6 @@ public class ExpandableNotificationRowController implements NotifViewController mStatusBarStateController, mPeopleNotificationIdentifier, mOnUserInteractionCallback, - mBubblesManagerOptional, mNotificationGutsManager, mDismissibilityProvider, mMetricsLogger, @@ -348,7 +342,6 @@ public class ExpandableNotificationRowController implements NotifViewController mColorUpdateLogger, mSmartReplyConstants, mSmartReplyController, - mFeatureFlags, mStatusBarService, mUiEventLogger ); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java index ea508748fada..9712db8a1812 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java @@ -59,6 +59,7 @@ import com.android.systemui.res.R; import com.android.systemui.scene.domain.interactor.WindowRootViewVisibilityInteractor; import com.android.systemui.settings.UserContextProvider; import com.android.systemui.shade.ShadeController; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationPresenter; import com.android.systemui.statusbar.StatusBarState; @@ -134,7 +135,8 @@ public class NotificationGutsManager implements NotifGutsViewManager, CoreStarta private final ActivityStarter mActivityStarter; @Inject - public NotificationGutsManager(Context context, + public NotificationGutsManager( + @ShadeDisplayAware Context context, @Main Handler mainHandler, @Background Handler bgHandler, JavaAdapter javaAdapter, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/ActiveNotificationModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/ActiveNotificationModel.kt index a2b71551eca8..ab8be306ab5e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/ActiveNotificationModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/shared/ActiveNotificationModel.kt @@ -38,9 +38,6 @@ data class ActiveNotificationModel( val groupKey: String?, /** When this notification was posted. */ val whenTime: Long, - // TODO(b/377566661): Make isPromoted just check if promotedContent != null. - /** True if this notification should be promoted and false otherwise. */ - val isPromoted: Boolean, /** Is this entry in the ambient / minimized section (lowest priority)? */ val isAmbient: Boolean, /** 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 ad3611796d62..64ca81545040 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 @@ -30,6 +30,7 @@ import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dump.DumpManager; import com.android.systemui.res.R; import com.android.systemui.scene.shared.flag.SceneContainerFlag; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.shade.transition.LargeScreenShadeInterpolator; import com.android.systemui.statusbar.NotificationShelf; import com.android.systemui.statusbar.StatusBarState; @@ -297,7 +298,7 @@ public class AmbientState implements Dumpable { @Inject public AmbientState( - @NonNull Context context, + @NonNull @ShadeDisplayAware Context context, @NonNull DumpManager dumpManager, @NonNull SectionProvider sectionProvider, @NonNull BypassController bypassController, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java index cfca8307e703..c8e18a8fe5ca 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java @@ -499,7 +499,7 @@ public class NotificationChildrenContainer extends ViewGroup mGroupHeaderWrapper.setExpanded(mChildrenExpanded); mGroupHeaderWrapper.onContentUpdated(mContainingNotification); - + resetHeaderVisibilityIfNeeded(mGroupHeader, calculateDesiredHeader()); updateHeaderVisibility(false /* animate */); updateChildrenAppearance(); @@ -535,6 +535,7 @@ public class NotificationChildrenContainer extends ViewGroup invalidate(); mMinimizedGroupHeaderWrapper.onContentUpdated(mContainingNotification); + resetHeaderVisibilityIfNeeded(mMinimizedGroupHeader, calculateDesiredHeader()); updateHeaderVisibility(false /* animate */); updateChildrenAppearance(); } @@ -1127,7 +1128,7 @@ public class NotificationChildrenContainer extends ViewGroup final int count = mAttachedChildren.size(); for (int childIdx = 0; childIdx < count; childIdx++) { ExpandableNotificationRow child = mAttachedChildren.get(childIdx); - child.setChildrenExpanded(childrenExpanded, false); + child.setChildrenExpanded(childrenExpanded); } updateHeaderTouchability(); } 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 c7b3fd7842e2..b9e38abf8ab2 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 @@ -99,7 +99,6 @@ import com.android.systemui.statusbar.NotificationShelf; import com.android.systemui.statusbar.StatusBarState; import com.android.systemui.statusbar.notification.ColorUpdateLogger; import com.android.systemui.statusbar.notification.FakeShadowView; -import com.android.systemui.statusbar.notification.headsup.HeadsUpTouchHelper; import com.android.systemui.statusbar.notification.LaunchAnimationParameters; import com.android.systemui.statusbar.notification.NotificationTransitionAnimatorController; import com.android.systemui.statusbar.notification.NotificationUtils; @@ -110,6 +109,8 @@ import com.android.systemui.statusbar.notification.emptyshade.shared.ModesEmptyS import com.android.systemui.statusbar.notification.emptyshade.ui.view.EmptyShadeView; import com.android.systemui.statusbar.notification.footer.shared.FooterViewRefactor; import com.android.systemui.statusbar.notification.footer.ui.view.FooterView; +import com.android.systemui.statusbar.notification.headsup.HeadsUpTouchHelper; +import com.android.systemui.statusbar.notification.headsup.HeadsUpUtil; import com.android.systemui.statusbar.notification.logging.NotificationLogger; import com.android.systemui.statusbar.notification.row.ActivatableNotificationView; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; @@ -126,7 +127,6 @@ import com.android.systemui.statusbar.notification.stack.shared.model.ShadeScrol import com.android.systemui.statusbar.notification.stack.ui.view.NotificationScrollView; import com.android.systemui.statusbar.phone.HeadsUpAppearanceController; import com.android.systemui.statusbar.phone.ScreenOffAnimationController; -import com.android.systemui.statusbar.notification.headsup.HeadsUpUtil; import com.android.systemui.statusbar.policy.ScrollAdapter; import com.android.systemui.statusbar.policy.SplitShadeStateController; import com.android.systemui.util.Assert; @@ -6860,7 +6860,7 @@ public class NotificationStackScrollLayout mExpandedGroupView = changedRow; mNeedsAnimation = true; } - changedRow.setChildrenExpanded(expanded, animated); + changedRow.setChildrenExpanded(expanded); onChildHeightChanged(changedRow, false /* needsAnimation */); runAfterAnimationFinished(new Runnable() { 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 e89645d7cb94..ba707a5cd0b1 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 @@ -86,6 +86,7 @@ import com.android.systemui.scene.shared.flag.SceneContainerFlag; import com.android.systemui.scene.ui.view.WindowRootView; import com.android.systemui.shade.QSHeaderBoundsProvider; import com.android.systemui.shade.ShadeController; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.shade.ShadeViewController; import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.LockscreenShadeTransitionController; @@ -734,7 +735,7 @@ public class NotificationStackScrollLayoutController implements Dumpable { TunerService tunerService, DeviceProvisionedController deviceProvisionedController, DynamicPrivacyController dynamicPrivacyController, - ConfigurationController configurationController, + @ShadeDisplayAware ConfigurationController configurationController, SysuiStatusBarStateController statusBarStateController, KeyguardMediaController keyguardMediaController, KeyguardBypassController keyguardBypassController, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt index 5dff8120f33f..a96d972af2c4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackSizeCalculator.kt @@ -22,9 +22,9 @@ import android.view.View.GONE import androidx.annotation.VisibleForTesting import com.android.systemui.dagger.SysUISingleton import com.android.systemui.dagger.qualifiers.Application -import com.android.systemui.dagger.qualifiers.Main import com.android.systemui.media.controls.domain.pipeline.MediaDataManager import com.android.systemui.res.R +import com.android.systemui.shade.ShadeDisplayAware import com.android.systemui.statusbar.LockscreenShadeTransitionController import com.android.systemui.statusbar.StatusBarState.KEYGUARD import com.android.systemui.statusbar.SysuiStatusBarStateController @@ -60,7 +60,7 @@ constructor( private val statusBarStateController: SysuiStatusBarStateController, private val lockscreenShadeTransitionController: LockscreenShadeTransitionController, private val mediaDataManager: MediaDataManager, - @Main private val resources: Resources, + @ShadeDisplayAware private val resources: Resources, private val splitShadeStateController: SplitShadeStateController, private val seenNotificationsInteractor: SeenNotificationsInteractor, @Application private val scope: CoroutineScope, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java index 0e94ca351835..50457449f466 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationSwipeHelper.java @@ -40,6 +40,7 @@ import com.android.systemui.flags.FeatureFlags; import com.android.systemui.plugins.FalsingManager; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; import com.android.systemui.plugins.statusbar.NotificationSwipeActionHelper; +import com.android.systemui.shade.ShadeDisplayAware; import com.android.systemui.statusbar.NotificationShelf; import com.android.systemui.statusbar.notification.SourceType; import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow; @@ -560,7 +561,7 @@ class NotificationSwipeHelper extends SwipeHelper implements NotificationSwipeAc private NotificationRoundnessManager mNotificationRoundnessManager; @Inject - Builder(@Main Resources resources, ViewConfiguration viewConfiguration, + Builder(@ShadeDisplayAware Resources resources, ViewConfiguration viewConfiguration, DumpManager dumpManager, FalsingManager falsingManager, FeatureFlags featureFlags, NotificationRoundnessManager notificationRoundnessManager) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java index 6de4928cd0c1..e4768e83f7d0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java @@ -71,6 +71,7 @@ import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarCompone import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent.Startable; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallListener; +import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization; import com.android.systemui.statusbar.phone.ui.DarkIconManager; import com.android.systemui.statusbar.phone.ui.StatusBarIconController; import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder; @@ -960,7 +961,9 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue mOngoingCallController.addCallback(mOngoingCallListener); } // TODO(b/364653005): Do we also need to set the secondary activity chip? - mOngoingCallController.setChipView(mPrimaryOngoingActivityChip); + if (!StatusBarChipsModernization.isEnabled()) { + mOngoingCallController.setChipView(mPrimaryOngoingActivityChip); + } } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt index 78926c78a368..216630409160 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/OngoingCallController.kt @@ -60,7 +60,10 @@ import java.util.concurrent.Executor import javax.inject.Inject import kotlinx.coroutines.CoroutineScope -/** A controller to handle the ongoing call chip in the collapsed status bar. */ +/** A controller to handle the ongoing call chip in the collapsed status bar. + * @deprecated Use [OngoingCallInteractor] instead, which follows recommended architecture patterns + */ +@Deprecated("Use OngoingCallInteractor instead") @SysUISingleton class OngoingCallController @Inject @@ -165,6 +168,9 @@ constructor( } override fun start() { + if (StatusBarChipsModernization.isEnabled) + return + dumpManager.registerDumpable(this) if (Flags.statusBarUseReposForCallChip()) { @@ -201,6 +207,8 @@ constructor( * [com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment]. */ fun setChipView(chipView: View) { + StatusBarChipsModernization.assertInLegacyMode() + tearDownChipView() this.chipView = chipView val backgroundView: ChipBackgroundContainer? = @@ -217,6 +225,8 @@ constructor( * Returns true if there's an active ongoing call that should be displayed in a status bar chip. */ fun hasOngoingCall(): Boolean { + StatusBarChipsModernization.assertInLegacyMode() + return callNotificationInfo?.isOngoing == true && // When the user is in the phone app, don't show the chip. !uidObserver.isCallAppVisible @@ -224,6 +234,8 @@ constructor( /** Creates the right [OngoingCallModel] based on the call state. */ private fun getOngoingCallModel(): OngoingCallModel { + StatusBarChipsModernization.assertInLegacyMode() + if (hasOngoingCall()) { val currentInfo = callNotificationInfo @@ -255,6 +267,8 @@ constructor( } override fun addCallback(listener: OngoingCallListener) { + StatusBarChipsModernization.assertInLegacyMode() + synchronized(mListeners) { if (!mListeners.contains(listener)) { mListeners.add(listener) @@ -263,10 +277,14 @@ constructor( } override fun removeCallback(listener: OngoingCallListener) { + StatusBarChipsModernization.assertInLegacyMode() + synchronized(mListeners) { mListeners.remove(listener) } } private fun updateInfoFromNotifModel(notifModel: ActiveNotificationModel?) { + StatusBarChipsModernization.assertInLegacyMode() + if (notifModel == null) { logger.log(TAG, LogLevel.DEBUG, {}, { "NotifInteractorCallModel: null" }) removeChip() @@ -310,6 +328,8 @@ constructor( } private fun updateChip() { + StatusBarChipsModernization.assertInLegacyMode() + val currentCallNotificationInfo = callNotificationInfo ?: return val currentChipView = chipView @@ -360,6 +380,8 @@ constructor( } private fun updateChipClickListener() { + StatusBarChipsModernization.assertInLegacyMode() + if (Flags.statusBarScreenSharingChips()) { return } @@ -386,10 +408,14 @@ constructor( /** Returns true if the given [procState] represents a process that's visible to the user. */ private fun isProcessVisibleToUser(procState: Int): Boolean { + StatusBarChipsModernization.assertInLegacyMode() + return procState <= ActivityManager.PROCESS_STATE_TOP } private fun updateGestureListening() { + StatusBarChipsModernization.assertInLegacyMode() + if ( callNotificationInfo == null || callNotificationInfo?.statusBarSwipedAway == true || @@ -404,6 +430,8 @@ constructor( } private fun removeChip() { + StatusBarChipsModernization.assertInLegacyMode() + callNotificationInfo = null if (!Flags.statusBarScreenSharingChips()) { tearDownChipView() @@ -432,6 +460,8 @@ constructor( * detected. */ private fun onSwipeAwayGestureDetected() { + StatusBarChipsModernization.assertInLegacyMode() + logger.log(TAG, LogLevel.DEBUG, {}, { "Swipe away gesture detected" }) callNotificationInfo = callNotificationInfo?.copy(statusBarSwipedAway = true) statusBarWindowControllerStore.defaultDisplay.setOngoingProcessRequiresStatusBarVisible( @@ -441,6 +471,8 @@ constructor( } private fun sendStateChangeEvent() { + StatusBarChipsModernization.assertInLegacyMode() + ongoingCallRepository.setOngoingCallState(getOngoingCallModel()) mListeners.forEach { l -> l.onOngoingCallStateChanged(animate = true) } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/StatusBarChipsModernization.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/StatusBarChipsModernization.kt new file mode 100644 index 000000000000..2ab2b68bbb2e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/StatusBarChipsModernization.kt @@ -0,0 +1,52 @@ +/* +* Copyright (C) 2024 The Android Open Source Project +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +package com.android.systemui.statusbar.phone.ongoingcall + +import com.android.systemui.Flags +import com.android.systemui.flags.FlagToken +import com.android.systemui.flags.RefactorFlagUtils + +/** Helper for reading or using the status_bar_use_interactor_for_call_chip flag state. */ +@Suppress("NOTHING_TO_INLINE") +object StatusBarChipsModernization { + /** The aconfig flag name */ + const val FLAG_NAME = Flags.FLAG_STATUS_BAR_CHIPS_MODERNIZATION + + /** A token used for dependency declaration */ + val token: FlagToken + get() = FlagToken(FLAG_NAME, isEnabled) + + /** Is the refactor enabled */ + @JvmStatic + inline val isEnabled + get() = Flags.statusBarChipsModernization() && Flags.statusBarRootModernization() + + /** + * Called to ensure code is only run when the flag is enabled. This protects users from the + * unintended behaviors caused by accidentally running new logic, while also crashing on an eng + * build to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun isUnexpectedlyInLegacyMode() = + RefactorFlagUtils.isUnexpectedlyInLegacyMode(isEnabled, FLAG_NAME) + + /** + * Called to ensure code is only run when the flag is disabled. This will throw an exception if + * the flag is enabled to ensure that the refactor author catches issues in testing. + */ + @JvmStatic + inline fun assertInLegacyMode() = RefactorFlagUtils.assertInLegacyMode(isEnabled, FLAG_NAME) +}
\ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepository.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepository.kt index f16371ae7e21..b932c71ab426 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/data/repository/OngoingCallRepository.kt @@ -20,6 +20,7 @@ import com.android.systemui.dagger.SysUISingleton import com.android.systemui.log.LogBuffer import com.android.systemui.log.core.LogLevel import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallLog +import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow @@ -33,7 +34,9 @@ import kotlinx.coroutines.flow.asStateFlow * [com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController] and * [com.android.systemui.statusbar.data.repository.StatusBarModeRepositoryStore]. Instead, those two * classes both refer to this repository. + * @deprecated Use [OngoingCallInteractor] instead. */ +@Deprecated("Use OngoingCallInteractor instead") @SysUISingleton class OngoingCallRepository @Inject @@ -49,6 +52,8 @@ constructor( * [com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController]. */ fun setOngoingCallState(state: OngoingCallModel) { + StatusBarChipsModernization.assertInLegacyMode() + logger.log( TAG, LogLevel.DEBUG, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractor.kt new file mode 100644 index 000000000000..1f7bd1418543 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractor.kt @@ -0,0 +1,104 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone.ongoingcall.domain.interactor + +import com.android.systemui.activity.data.repository.ActivityManagerRepository +import com.android.systemui.dagger.SysUISingleton +import com.android.systemui.dagger.qualifiers.Application +import com.android.systemui.log.LogBuffer +import com.android.systemui.log.core.Logger +import com.android.systemui.statusbar.notification.domain.interactor.ActiveNotificationsInteractor +import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallLog +import com.android.systemui.statusbar.phone.ongoingcall.shared.model.OngoingCallModel +import javax.inject.Inject +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine +import kotlinx.coroutines.flow.flatMapLatest +import kotlinx.coroutines.flow.flowOf +import kotlinx.coroutines.flow.stateIn + +/** + * Interactor for determining whether to show a chip in the status bar for ongoing phone calls. + * + * This class monitors call notifications and the visibility of call apps to determine the appropriate + * chip state. It emits: + * * - [OngoingCallModel.NoCall] when there is no call notification + * * - [OngoingCallModel.InCallWithVisibleApp] when there is a call notification but the call app is visible + * * - [OngoingCallModel.InCall] when there is a call notification and the call app is not visible + * */ +@OptIn(ExperimentalCoroutinesApi::class) +@SysUISingleton +class OngoingCallInteractor @Inject constructor( + @Application private val scope: CoroutineScope, + activityManagerRepository: ActivityManagerRepository, + activeNotificationsInteractor: ActiveNotificationsInteractor, + @OngoingCallLog private val logBuffer: LogBuffer, +) { + private val logger = Logger(logBuffer, TAG) + + /** + * The current state of ongoing calls. + */ + val ongoingCallState: StateFlow<OngoingCallModel> = + activeNotificationsInteractor.ongoingCallNotification + .flatMapLatest { notificationModel -> + when (notificationModel) { + null -> { + logger.d("No active call notification - hiding chip") + flowOf(OngoingCallModel.NoCall) + } + + else -> combine( + flowOf(notificationModel), + activityManagerRepository.createIsAppVisibleFlow( + creationUid = notificationModel.uid, + logger = logger, + identifyingLogTag = TAG, + ), + ) { model, isVisible -> + when { + isVisible -> { + logger.d({ "Call app is visible: uid=$int1" }) { + int1 = model.uid + } + OngoingCallModel.InCallWithVisibleApp + } + + else -> { + logger.d({ "Active call detected: startTime=$long1 hasIcon=$bool1" }) { + long1 = model.whenTime + bool1 = model.statusBarChipIconView != null + } + OngoingCallModel.InCall( + startTimeMs = model.whenTime, + notificationIconView = model.statusBarChipIconView, + intent = model.contentIntent, + ) + } + } + } + } + } + .stateIn(scope, SharingStarted.WhileSubscribed(), OngoingCallModel.NoCall) + + companion object { + private val TAG = "OngoingCall" + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/shared/model/OngoingCallModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/shared/model/OngoingCallModel.kt index 34bff80ea919..c2c91b27d074 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/shared/model/OngoingCallModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ongoingcall/shared/model/OngoingCallModel.kt @@ -25,6 +25,12 @@ sealed interface OngoingCallModel { data object NoCall : OngoingCallModel /** + * There is an ongoing call but the call app is currently visible, so we don't need to show + * the chip. + */ + data object InCallWithVisibleApp : OngoingCallModel + + /** * There *is* an ongoing call. * * @property startTimeMs the time that the phone call started, based on the notification's diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt index 1e8b0166409c..812e0eb0908f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt @@ -41,6 +41,7 @@ import com.android.systemui.statusbar.phone.PhoneStatusBarView import com.android.systemui.statusbar.phone.StatusBarLocation import com.android.systemui.statusbar.phone.StatusIconContainer import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController +import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization import com.android.systemui.statusbar.phone.ui.DarkIconManager import com.android.systemui.statusbar.phone.ui.StatusBarIconController import com.android.systemui.statusbar.pipeline.shared.ui.binder.HomeStatusBarViewBinder @@ -150,12 +151,11 @@ fun StatusBarRoot( ) iconController.addIconGroup(darkIconManager) - // TODO(b/372657935): This won't be needed once OngoingCallController is - // implemented in recommended architecture - ongoingCallController.setChipView( - phoneStatusBarView.requireViewById(R.id.ongoing_activity_chip_primary) - ) - + if (!StatusBarChipsModernization.isEnabled) { + ongoingCallController.setChipView( + phoneStatusBarView.requireViewById(R.id.ongoing_activity_chip_primary) + ) + } // For notifications, first inflate the [NotificationIconContainer] val notificationIconArea = phoneStatusBarView.requireViewById<ViewGroup>(R.id.notification_icon_area) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt index ed0eb6d44508..d3e37119fdcb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/model/InternetTileModel.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.pipeline.shared.ui.model +import android.annotation.SuppressLint import android.content.Context import android.graphics.drawable.Drawable import android.service.quicksettings.Tile @@ -36,6 +37,7 @@ sealed interface InternetTileModel { val stateDescription: ContentDescription? val contentDescription: ContentDescription? + @SuppressLint("UseCompatLoadingForDrawables") fun applyTo(state: QSTile.BooleanState, context: Context) { if (secondaryLabel != null) { state.secondaryLabel = secondaryLabel.loadText(context) @@ -50,7 +52,7 @@ sealed interface InternetTileModel { if (icon != null) { state.icon = icon } else if (iconId != null) { - state.icon = QSTileImpl.ResourceIcon.get(iconId!!) + state.icon = QSTileImpl.maybeLoadResourceIcon(iconId!!, context) } state.state = diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastController.java index a3dcc3b6f851..ece5a3facdf4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastController.java @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.policy; +import android.media.projection.StopReason; import com.android.systemui.Dumpable; import com.android.systemui.statusbar.policy.CastController.Callback; @@ -26,7 +27,7 @@ public interface CastController extends CallbackController<Callback>, Dumpable { void setCurrentUserId(int currentUserId); List<CastDevice> getCastDevices(); void startCasting(CastDevice device); - void stopCasting(CastDevice device); + void stopCasting(CastDevice device, @StopReason int stopReason); /** * @return whether we have a connected device. diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java index 52f80fbf50fd..ab208506f203 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java @@ -185,13 +185,13 @@ public class CastControllerImpl implements CastController { } @Override - public void stopCasting(CastDevice device) { + public void stopCasting(CastDevice device, @StopReason int stopReason) { final boolean isProjection = device.getTag() instanceof MediaProjectionInfo; mLogger.logStopCasting(isProjection); if (isProjection) { final MediaProjectionInfo projection = (MediaProjectionInfo) device.getTag(); if (Objects.equals(mProjectionManager.getActiveProjectionInfo(), projection)) { - mProjectionManager.stopActiveProjection(StopReason.STOP_QS_TILE); + mProjectionManager.stopActiveProjection(stopReason); } else { mLogger.logStopCastingNoProjection(projection); } diff --git a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java index 1c3fece1beb1..28cf78f6777e 100644 --- a/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java +++ b/packages/SystemUI/src/com/android/systemui/theme/ThemeOverlayController.java @@ -149,7 +149,8 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { private double mContrast = 0.0; // Theme variant: Vibrant, Tonal, Expressive, etc @VisibleForTesting - protected Style mThemeStyle = Style.TONAL_SPOT; + @Style.Type + protected int mThemeStyle = Style.TONAL_SPOT; // Accent colors overlay private FabricatedOverlay mSecondaryOverlay; // Neutral system colors overlay @@ -826,15 +827,16 @@ public class ThemeOverlayController implements CoreStartable, Dumpable { } - private Style fetchThemeStyleFromSetting() { + @Style.Type + private int fetchThemeStyleFromSetting() { // Allow-list of Style objects that can be created from a setting string, i.e. can be // used as a system-wide theme. // - Content intentionally excluded, intended for media player, not system-wide - List<Style> validStyles = new ArrayList<>(Arrays.asList(Style.EXPRESSIVE, Style.SPRITZ, - Style.TONAL_SPOT, Style.FRUIT_SALAD, Style.RAINBOW, Style.VIBRANT, + @Style.Type List<Integer> validStyles = new ArrayList<>(Arrays.asList(Style.EXPRESSIVE, + Style.SPRITZ, Style.TONAL_SPOT, Style.FRUIT_SALAD, Style.RAINBOW, Style.VIBRANT, Style.MONOCHROMATIC)); - Style style = mThemeStyle; + @Style.Type int style = mThemeStyle; final String overlayPackageJson = mSecureSettings.getStringForUser( Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES, mUserTracker.getUserId()); diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/VolumeDialogPlugin.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/VolumeDialogPlugin.kt index 094ec39c1c98..203a157f6ffc 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dialog/VolumeDialogPlugin.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/VolumeDialogPlugin.kt @@ -16,19 +16,31 @@ package com.android.systemui.volume.dialog +import android.content.Context +import android.media.AudioManager import com.android.app.tracing.coroutines.coroutineScopeTraced import com.android.app.tracing.coroutines.launchTraced as launch import com.android.systemui.dagger.qualifiers.Application import com.android.systemui.plugins.VolumeDialog +import com.android.systemui.volume.SafetyWarningDialog import com.android.systemui.volume.dialog.dagger.VolumeDialogPluginComponent +import com.android.systemui.volume.dialog.ui.viewmodel.VolumeDialogPluginViewModel import javax.inject.Inject +import kotlin.coroutines.resume import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.launchIn +import kotlinx.coroutines.flow.mapLatest +import kotlinx.coroutines.suspendCancellableCoroutine +@OptIn(ExperimentalCoroutinesApi::class) class VolumeDialogPlugin @Inject constructor( @Application private val applicationCoroutineScope: CoroutineScope, + private val context: Context, + private val audioManager: AudioManager, private val volumeDialogPluginComponentFactory: VolumeDialogPluginComponent.Factory, ) : VolumeDialog { @@ -41,14 +53,39 @@ constructor( coroutineScopeTraced("[Volume]plugin") { pluginComponent = volumeDialogPluginComponentFactory.create(this).also { - it.viewModel().launchVolumeDialog() + bindPlugin(it.viewModel()) } } } } + private fun CoroutineScope.bindPlugin(viewModel: VolumeDialogPluginViewModel) { + viewModel.launchVolumeDialog() + + viewModel.isShowingSafetyWarning + .mapLatest { isShowingSafetyWarning -> + if (isShowingSafetyWarning) { + showSafetyWarningVisibility { viewModel.onSafetyWarningDismissed() } + } + } + .launchIn(this) + } + override fun destroy() { job?.cancel() pluginComponent = null } + + private suspend fun showSafetyWarningVisibility(onDismissed: () -> Unit) = + suspendCancellableCoroutine { continuation -> + val dialog = + object : SafetyWarningDialog(context, audioManager) { + override fun cleanUp() { + onDismissed() + continuation.resume(Unit) + } + } + dialog.show() + continuation.invokeOnCancellation { dialog.dismiss() } + } } diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractor.kt new file mode 100644 index 000000000000..f707d6713f9b --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractor.kt @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.volume.dialog.domain.interactor + +import android.media.AudioManager +import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogPluginScope +import com.android.systemui.volume.dialog.shared.model.VolumeDialogSafetyWarningModel +import com.android.systemui.volume.dialog.shared.model.VolumeDialogVisibilityModel +import javax.inject.Inject +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map + +private const val VISIBLE_FLAGS = AudioManager.FLAG_SHOW_UI or AudioManager.FLAG_SHOW_UI_WARNINGS + +@VolumeDialogPluginScope +class VolumeDialogSafetyWarningInteractor +@Inject +constructor( + private val stateInteractor: VolumeDialogStateInteractor, + visibilityInteractor: VolumeDialogVisibilityInteractor, +) { + + val isShowingSafetyWarning: Flow<Boolean> = + stateInteractor.volumeDialogState.map { + when (it.isShowingSafetyWarning) { + is VolumeDialogSafetyWarningModel.Visible -> + if (it.isShowingSafetyWarning.flags and VISIBLE_FLAGS == 0) { + visibilityInteractor.dialogVisibility.first() is + VolumeDialogVisibilityModel.Visible + } else { + true + } + is VolumeDialogSafetyWarningModel.Invisible -> false + } + } + + fun onSafetyWarningDismissed() { + stateInteractor.setSafetyWarning(VolumeDialogSafetyWarningModel.Invisible) + } +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogStateInteractor.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogStateInteractor.kt index 5c7289baa401..51e79242daaf 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogStateInteractor.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogStateInteractor.kt @@ -23,6 +23,7 @@ import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogPlugin import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogPluginScope import com.android.systemui.volume.dialog.data.repository.VolumeDialogStateRepository import com.android.systemui.volume.dialog.domain.model.VolumeDialogEventModel +import com.android.systemui.volume.dialog.shared.model.VolumeDialogSafetyWarningModel import com.android.systemui.volume.dialog.shared.model.VolumeDialogStateModel import com.android.systemui.volume.dialog.shared.model.VolumeDialogStreamModel import javax.inject.Inject @@ -61,6 +62,9 @@ constructor( oldState.copy(shouldShowA11ySlider = event.showA11yStream) } } + is VolumeDialogEventModel.ShowSafetyWarning -> { + setSafetyWarning(VolumeDialogSafetyWarningModel.Visible(event.flags)) + } else -> { // do nothing } @@ -72,6 +76,10 @@ constructor( val volumeDialogState: Flow<VolumeDialogStateModel> = volumeDialogStateRepository.state + fun setSafetyWarning(model: VolumeDialogSafetyWarningModel) { + volumeDialogStateRepository.updateState { it.copy(isShowingSafetyWarning = model) } + } + /** Returns a copy of [model] filled with the values from [VolumeDialogController.State]. */ private fun VolumeDialogController.State.copyIntoModel( model: VolumeDialogStateModel diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/shared/model/VolumeDialogSafetyWarningModel.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/shared/model/VolumeDialogSafetyWarningModel.kt new file mode 100644 index 000000000000..39fc222860c6 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/shared/model/VolumeDialogSafetyWarningModel.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.volume.dialog.shared.model + +/** Models current Volume Safety Dialog state. */ +sealed interface VolumeDialogSafetyWarningModel { + + /** Volume Safety Dialog is visible and has been shown with the [flags]. */ + data class Visible(val flags: Int) : VolumeDialogSafetyWarningModel + + /** Volume Safety Dialog is invisible. */ + data object Invisible : VolumeDialogSafetyWarningModel +} diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/shared/model/VolumeDialogStateModel.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/shared/model/VolumeDialogStateModel.kt index 1792b9967681..838006d0adb2 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dialog/shared/model/VolumeDialogStateModel.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/shared/model/VolumeDialogStateModel.kt @@ -21,6 +21,8 @@ import android.content.ComponentName /** Models a state of the Volume Dialog. */ data class VolumeDialogStateModel( val shouldShowA11ySlider: Boolean = false, + val isShowingSafetyWarning: VolumeDialogSafetyWarningModel = + VolumeDialogSafetyWarningModel.Invisible, val streamModels: Map<Int, VolumeDialogStreamModel> = mapOf(), val ringerModeInternal: Int = 0, val ringerModeExternal: Int = 0, diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/ui/viewmodel/VolumeDialogPluginViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/ui/viewmodel/VolumeDialogPluginViewModel.kt index ff525f46a7ed..9bab1b0aa25d 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dialog/ui/viewmodel/VolumeDialogPluginViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/ui/viewmodel/VolumeDialogPluginViewModel.kt @@ -18,14 +18,17 @@ package com.android.systemui.volume.dialog.ui.viewmodel import com.android.systemui.volume.Events import com.android.systemui.volume.dialog.VolumeDialog +import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogPlugin import com.android.systemui.volume.dialog.dagger.scope.VolumeDialogPluginScope +import com.android.systemui.volume.dialog.domain.interactor.VolumeDialogSafetyWarningInteractor import com.android.systemui.volume.dialog.domain.interactor.VolumeDialogVisibilityInteractor import com.android.systemui.volume.dialog.shared.VolumeDialogLogger import com.android.systemui.volume.dialog.shared.model.VolumeDialogVisibilityModel import javax.inject.Inject import javax.inject.Provider +import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.mapLatest @@ -34,29 +37,35 @@ import kotlinx.coroutines.flow.mapLatest class VolumeDialogPluginViewModel @Inject constructor( + @VolumeDialogPlugin private val coroutineScope: CoroutineScope, private val dialogVisibilityInteractor: VolumeDialogVisibilityInteractor, + private val dialogSafetyWarningInteractor: VolumeDialogSafetyWarningInteractor, private val volumeDialogProvider: Provider<VolumeDialog>, private val logger: VolumeDialogLogger, ) { - suspend fun launchVolumeDialog() { - coroutineScope { - dialogVisibilityInteractor.dialogVisibility - .mapLatest { visibilityModel -> - with(visibilityModel) { - if (this is VolumeDialogVisibilityModel.Visible) { - showDialog() - Events.writeEvent(Events.EVENT_SHOW_DIALOG, reason, keyguardLocked) - logger.onShow(reason) - } - if (this is VolumeDialogVisibilityModel.Dismissed) { - Events.writeEvent(Events.EVENT_DISMISS_DIALOG, reason) - logger.onDismiss(reason) - } + fun launchVolumeDialog() { + dialogVisibilityInteractor.dialogVisibility + .mapLatest { visibilityModel -> + with(visibilityModel) { + if (this is VolumeDialogVisibilityModel.Visible) { + showDialog() + Events.writeEvent(Events.EVENT_SHOW_DIALOG, reason, keyguardLocked) + logger.onShow(reason) + } + if (this is VolumeDialogVisibilityModel.Dismissed) { + Events.writeEvent(Events.EVENT_DISMISS_DIALOG, reason) + logger.onDismiss(reason) } } - .launchIn(this) - } + } + .launchIn(coroutineScope) + } + + val isShowingSafetyWarning: Flow<Boolean> = dialogSafetyWarningInteractor.isShowingSafetyWarning + + fun onSafetyWarningDismissed() { + dialogSafetyWarningInteractor.onSafetyWarningDismissed() } private fun showDialog() { diff --git a/packages/SystemUI/src/com/android/systemui/volume/dialog/ui/viewmodel/VolumeDialogViewModel.kt b/packages/SystemUI/src/com/android/systemui/volume/dialog/ui/viewmodel/VolumeDialogViewModel.kt index 7a6ede4c8b9c..b20dffb8ac33 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/dialog/ui/viewmodel/VolumeDialogViewModel.kt +++ b/packages/SystemUI/src/com/android/systemui/volume/dialog/ui/viewmodel/VolumeDialogViewModel.kt @@ -44,9 +44,9 @@ class VolumeDialogViewModel @Inject constructor( private val context: Context, - dialogVisibilityInteractor: VolumeDialogVisibilityInteractor, + private val dialogVisibilityInteractor: VolumeDialogVisibilityInteractor, volumeDialogSlidersInteractor: VolumeDialogSlidersInteractor, - volumeDialogStateInteractor: VolumeDialogStateInteractor, + private val volumeDialogStateInteractor: VolumeDialogStateInteractor, devicePostureController: DevicePostureController, configurationController: ConfigurationController, ) { diff --git a/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java b/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java index 1d32a4fd69d6..389b6fb4b0ef 100644 --- a/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java +++ b/packages/SystemUI/src/com/android/systemui/wallet/controller/QuickAccessWalletController.java @@ -32,6 +32,7 @@ import android.provider.Settings; import android.service.quickaccesswallet.GetWalletCardsRequest; import android.service.quickaccesswallet.QuickAccessWalletClient; import android.service.quickaccesswallet.QuickAccessWalletClientImpl; +import android.service.quickaccesswallet.WalletCard; import android.util.Log; import com.android.systemui.animation.ActivityTransitionAnimator; @@ -268,6 +269,23 @@ public class QuickAccessWalletController { }); } + /** + * Starts the {@link android.app.PendingIntent} for a {@link WalletCard}. + * + * This should be used to open a selected card from the QuickAccessWallet UI or + * the settings tile. + * + * @param activityStarter an {@link ActivityStarter} to launch the Intent or PendingIntent. + * @param animationController an {@link ActivityTransitionAnimator.Controller} to provide a + * smooth animation for the activity launch. + */ + public void startWalletCardPendingIntent(WalletCard card, + ActivityStarter activityStarter, + ActivityTransitionAnimator.Controller animationController) { + activityStarter.postStartActivityDismissingKeyguard( + card.getPendingIntent(), animationController); + } + private Intent getSysUiWalletIntent() { return new Intent(mContext, WalletActivity.class) .setAction(Intent.ACTION_VIEW); diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupHelperTest.kt b/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupHelperTest.kt index 4ca84c58f6d9..50fad3bf697e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupHelperTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupHelperTest.kt @@ -32,6 +32,7 @@ import com.android.systemui.communal.data.backup.CommunalBackupUtilsTest.FakeWid import com.android.systemui.communal.data.db.CommunalDatabase import com.android.systemui.communal.data.db.CommunalWidgetDao import com.android.systemui.communal.proto.toCommunalHubState +import com.android.systemui.communal.shared.model.SpanValue import com.android.systemui.lifecycle.InstantTaskExecutorRule import com.google.common.truth.Truth.assertThat import java.io.File @@ -120,21 +121,32 @@ class CommunalBackupHelperTest : SysuiTestCase() { componentName = "com.android.fakePackage1/fakeWidget1", rank = 0, userSerialNumber = 0, + spanY = SpanValue.Responsive(1), ), FakeWidgetMetadata( widgetId = 12, componentName = "com.android.fakePackage2/fakeWidget2", rank = 1, userSerialNumber = 0, + spanY = SpanValue.Responsive(2), ), FakeWidgetMetadata( widgetId = 13, componentName = "com.android.fakePackage3/fakeWidget3", rank = 2, userSerialNumber = 10, + spanY = SpanValue.Responsive(3), ), ) - .onEach { dao.addWidget(it.widgetId, it.componentName, it.rank, it.userSerialNumber) } + .onEach { + dao.addWidget( + widgetId = it.widgetId, + componentName = it.componentName, + rank = it.rank, + userSerialNumber = it.userSerialNumber, + spanY = it.spanY, + ) + } } private fun getBackupDataInputStream(): BackupDataInputStream { diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupUtilsTest.kt b/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupUtilsTest.kt index edc8c837bf78..d31e4664d4a2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupUtilsTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/communal/data/backup/CommunalBackupUtilsTest.kt @@ -23,6 +23,9 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.communal.data.db.CommunalDatabase import com.android.systemui.communal.data.db.CommunalWidgetDao import com.android.systemui.communal.nano.CommunalHubState +import com.android.systemui.communal.shared.model.SpanValue +import com.android.systemui.communal.shared.model.toFixed +import com.android.systemui.communal.shared.model.toResponsive import com.android.systemui.lifecycle.InstantTaskExecutorRule import com.google.common.truth.Correspondence import com.google.common.truth.Truth.assertThat @@ -71,22 +74,25 @@ class CommunalBackupUtilsTest : SysuiTestCase() { componentName = "com.android.fakePackage1/fakeWidget1", rank = 0, userSerialNumber = 0, + spanY = SpanValue.Responsive(1), ), FakeWidgetMetadata( widgetId = 12, componentName = "com.android.fakePackage2/fakeWidget2", rank = 1, userSerialNumber = 0, + spanY = SpanValue.Responsive(2), ), FakeWidgetMetadata( widgetId = 13, componentName = "com.android.fakePackage3/fakeWidget3", rank = 2, userSerialNumber = 10, + spanY = SpanValue.Responsive(3), ), ) expectedWidgets.forEach { - dao.addWidget(it.widgetId, it.componentName, it.rank, it.userSerialNumber) + dao.addWidget(it.widgetId, it.componentName, it.rank, it.userSerialNumber, it.spanY) } // Get communal hub state @@ -150,6 +156,7 @@ class CommunalBackupUtilsTest : SysuiTestCase() { val componentName: String, val rank: Int, val userSerialNumber: Int, + val spanY: SpanValue, ) companion object { @@ -163,7 +170,9 @@ class CommunalBackupUtilsTest : SysuiTestCase() { actual?.widgetId == expected?.widgetId && actual?.componentName == expected?.componentName && actual?.rank == expected?.rank && - actual?.userSerialNumber == expected?.userSerialNumber + actual?.userSerialNumber == expected?.userSerialNumber && + actual?.spanY == expected?.spanY?.toFixed()?.value && + actual?.spanYNew == expected?.spanY?.toResponsive()?.value }, "represents", ) diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt b/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt index 7d5a334b45ea..1466e32b1296 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt @@ -22,6 +22,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import androidx.test.platform.app.InstrumentationRegistry import com.android.systemui.SysuiTestCase +import com.android.systemui.communal.shared.model.SpanValue +import com.android.systemui.communal.shared.model.toResponsive import com.android.systemui.lifecycle.InstantTaskExecutorRule import com.google.common.truth.Truth.assertThat import org.junit.Rule @@ -173,6 +175,49 @@ class CommunalDatabaseMigrationsTest : SysuiTestCase() { databaseV4.verifyWidgetsV4(fakeWidgetsV3.map { it.getV4() }) } + @Test + fun migrate4To5_addNewSpanYColumn() { + val databaseV4 = migrationTestHelper.createDatabase(DATABASE_NAME, version = 4) + + val fakeWidgetsV4 = + listOf( + FakeCommunalWidgetItemV4( + widgetId = 1, + componentName = "test_widget_1", + itemId = 11, + userSerialNumber = 0, + spanY = 3, + ), + FakeCommunalWidgetItemV4( + widgetId = 2, + componentName = "test_widget_2", + itemId = 12, + userSerialNumber = 10, + spanY = 6, + ), + FakeCommunalWidgetItemV4( + widgetId = 3, + componentName = "test_widget_3", + itemId = 13, + userSerialNumber = 0, + spanY = 0, + ), + ) + databaseV4.insertWidgetsV4(fakeWidgetsV4) + + databaseV4.verifyWidgetsV4(fakeWidgetsV4) + + val databaseV5 = + migrationTestHelper.runMigrationsAndValidate( + name = DATABASE_NAME, + version = 5, + validateDroppedTables = false, + CommunalDatabase.MIGRATION_4_5, + ) + + databaseV5.verifyWidgetsV5(fakeWidgetsV4.map { it.getV5() }) + } + private fun SupportSQLiteDatabase.insertWidgetsV1(widgets: List<FakeCommunalWidgetItemV1>) { widgets.forEach { widget -> execSQL( @@ -198,6 +243,24 @@ class CommunalDatabaseMigrationsTest : SysuiTestCase() { } } + private fun SupportSQLiteDatabase.insertWidgetsV4(widgets: List<FakeCommunalWidgetItemV4>) { + widgets.forEach { widget -> + execSQL( + "INSERT INTO communal_widget_table(" + + "widget_id, " + + "component_name, " + + "item_id, " + + "user_serial_number, " + + "span_y) " + + "VALUES(${widget.widgetId}, " + + "'${widget.componentName}', " + + "${widget.itemId}, " + + "${widget.userSerialNumber}," + + "${widget.spanY})" + ) + } + } + private fun SupportSQLiteDatabase.verifyWidgetsV1(widgets: List<FakeCommunalWidgetItemV1>) { val cursor = query("SELECT * FROM communal_widget_table") assertThat(cursor.moveToFirst()).isTrue() @@ -270,6 +333,27 @@ class CommunalDatabaseMigrationsTest : SysuiTestCase() { assertThat(cursor.isAfterLast).isTrue() } + private fun SupportSQLiteDatabase.verifyWidgetsV5(widgets: List<FakeCommunalWidgetItemV5>) { + val cursor = query("SELECT * FROM communal_widget_table") + assertThat(cursor.moveToFirst()).isTrue() + + widgets.forEach { widget -> + assertThat(cursor.getInt(cursor.getColumnIndex("widget_id"))).isEqualTo(widget.widgetId) + assertThat(cursor.getString(cursor.getColumnIndex("component_name"))) + .isEqualTo(widget.componentName) + assertThat(cursor.getInt(cursor.getColumnIndex("item_id"))).isEqualTo(widget.itemId) + assertThat(cursor.getInt(cursor.getColumnIndex("user_serial_number"))) + .isEqualTo(widget.userSerialNumber) + assertThat(cursor.getInt(cursor.getColumnIndex("span_y"))).isEqualTo(widget.spanY) + assertThat(cursor.getInt(cursor.getColumnIndex("span_y_new"))) + .isEqualTo(widget.spanYNew) + + cursor.moveToNext() + } + + assertThat(cursor.isAfterLast).isTrue() + } + private fun SupportSQLiteDatabase.insertRanks(ranks: List<FakeCommunalItemRank>) { ranks.forEach { rank -> execSQL("INSERT INTO communal_item_rank_table(rank) VALUES(${rank.rank})") @@ -334,6 +418,27 @@ class CommunalDatabaseMigrationsTest : SysuiTestCase() { val spanY: Int, ) + private fun FakeCommunalWidgetItemV4.getV5(): FakeCommunalWidgetItemV5 { + val spanYFixed = SpanValue.Fixed(spanY) + return FakeCommunalWidgetItemV5( + widgetId = widgetId, + componentName = componentName, + itemId = itemId, + userSerialNumber = userSerialNumber, + spanY = spanYFixed.value, + spanYNew = spanYFixed.toResponsive().value, + ) + } + + private data class FakeCommunalWidgetItemV5( + val widgetId: Int, + val componentName: String, + val itemId: Int, + val userSerialNumber: Int, + val spanY: Int, + val spanYNew: Int, + ) + private data class FakeCommunalItemRank(val rank: Int) companion object { diff --git a/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalWidgetDaoTest.kt b/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalWidgetDaoTest.kt index 2312bbd2d7f8..2acb7750273b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalWidgetDaoTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/communal/data/db/CommunalWidgetDaoTest.kt @@ -22,7 +22,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase import com.android.systemui.communal.nano.CommunalHubState -import com.android.systemui.communal.shared.model.CommunalContentSize +import com.android.systemui.communal.shared.model.SpanValue import com.android.systemui.coroutines.collectLastValue import com.android.systemui.lifecycle.InstantTaskExecutorRule import com.google.common.truth.Truth.assertThat @@ -68,12 +68,13 @@ class CommunalWidgetDaoTest : SysuiTestCase() { @Test fun addWidget_readValueInDb() = testScope.runTest { - val (widgetId, provider, rank, userSerialNumber) = widgetInfo1 + val (widgetId, provider, rank, userSerialNumber, spanY) = widgetInfo1 communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, rank = rank, userSerialNumber = userSerialNumber, + spanY = spanY, ) val entry = communalWidgetDao.getWidgetByIdNow(id = 1) assertThat(entry).isEqualTo(communalWidgetItemEntry1) @@ -82,12 +83,13 @@ class CommunalWidgetDaoTest : SysuiTestCase() { @Test fun deleteWidget_notInDb_returnsFalse() = testScope.runTest { - val (widgetId, provider, rank, userSerialNumber) = widgetInfo1 + val (widgetId, provider, rank, userSerialNumber, spanY) = widgetInfo1 communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, rank = rank, userSerialNumber = userSerialNumber, + spanY = spanY, ) assertThat(communalWidgetDao.deleteWidgetById(widgetId = 123)).isFalse() } @@ -98,12 +100,13 @@ class CommunalWidgetDaoTest : SysuiTestCase() { val widgetsToAdd = listOf(widgetInfo1, widgetInfo2) val widgets = collectLastValue(communalWidgetDao.getWidgets()) widgetsToAdd.forEach { - val (widgetId, provider, rank, userSerialNumber) = it + val (widgetId, provider, rank, userSerialNumber, spanY) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, rank = rank, userSerialNumber = userSerialNumber, + spanY = spanY, ) } assertThat(widgets()) @@ -126,11 +129,12 @@ class CommunalWidgetDaoTest : SysuiTestCase() { // Add widgets one by one without specifying rank val widgetsToAdd = listOf(widgetInfo1, widgetInfo2, widgetInfo3) widgetsToAdd.forEach { - val (widgetId, provider, _, userSerialNumber) = it + val (widgetId, provider, _, userSerialNumber, spanY) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, userSerialNumber = userSerialNumber, + spanY = spanY, ) } @@ -153,12 +157,13 @@ class CommunalWidgetDaoTest : SysuiTestCase() { val widgets = collectLastValue(communalWidgetDao.getWidgets()) widgetsToAdd.forEach { - val (widgetId, provider, rank, userSerialNumber) = it + val (widgetId, provider, rank, userSerialNumber, spanY) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, rank = rank, userSerialNumber = userSerialNumber, + spanY = spanY, ) } assertThat(widgets()) @@ -180,12 +185,13 @@ class CommunalWidgetDaoTest : SysuiTestCase() { val widgets = collectLastValue(communalWidgetDao.getWidgets()) widgetsToAdd.forEach { - val (widgetId, provider, rank, userSerialNumber) = it + val (widgetId, provider, rank, userSerialNumber, spanY) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, rank = rank, userSerialNumber = userSerialNumber, + spanY = spanY, ) } assertThat(widgets()) @@ -217,12 +223,13 @@ class CommunalWidgetDaoTest : SysuiTestCase() { val widgets = collectLastValue(communalWidgetDao.getWidgets()) existingWidgets.forEach { - val (widgetId, provider, rank, userSerialNumber) = it + val (widgetId, provider, rank, userSerialNumber, spanY) = it communalWidgetDao.addWidget( widgetId = widgetId, provider = provider, rank = rank, userSerialNumber = userSerialNumber, + spanY = spanY, ) } assertThat(widgets()) @@ -242,6 +249,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { provider = ComponentName("pk_name", "cls_name_4"), rank = 1, userSerialNumber = 0, + spanY = SpanValue.Responsive(1), ) val newRankEntry = CommunalItemRank(uid = 4L, rank = 1) @@ -253,6 +261,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { itemId = 4L, userSerialNumber = 0, spanY = 3, + spanYNew = 1, ) assertThat(widgets()) .containsExactly( @@ -279,21 +288,21 @@ class CommunalWidgetDaoTest : SysuiTestCase() { provider = ComponentName("pkg_name", "cls_name_1"), rank = 0, userSerialNumber = 0, - spanY = CommunalContentSize.FULL.span, + spanY = SpanValue.Responsive(1), ) communalWidgetDao.addWidget( widgetId = 2, provider = ComponentName("pkg_name", "cls_name_2"), rank = 1, userSerialNumber = 0, - spanY = CommunalContentSize.HALF.span, + spanY = SpanValue.Responsive(2), ) communalWidgetDao.addWidget( widgetId = 3, provider = ComponentName("pkg_name", "cls_name_3"), rank = 2, userSerialNumber = 0, - spanY = CommunalContentSize.THIRD.span, + spanY = SpanValue.Fixed(3), ) // Verify that the widgets have the correct spanY values @@ -306,7 +315,8 @@ class CommunalWidgetDaoTest : SysuiTestCase() { componentName = "pkg_name/cls_name_1", itemId = 1L, userSerialNumber = 0, - spanY = CommunalContentSize.FULL.span, + spanY = 3, + spanYNew = 1, ), CommunalItemRank(uid = 2L, rank = 1), CommunalWidgetItem( @@ -315,7 +325,8 @@ class CommunalWidgetDaoTest : SysuiTestCase() { componentName = "pkg_name/cls_name_2", itemId = 2L, userSerialNumber = 0, - spanY = CommunalContentSize.HALF.span, + spanY = 6, + spanYNew = 2, ), CommunalItemRank(uid = 3L, rank = 2), CommunalWidgetItem( @@ -324,7 +335,8 @@ class CommunalWidgetDaoTest : SysuiTestCase() { componentName = "pkg_name/cls_name_3", itemId = 3L, userSerialNumber = 0, - spanY = CommunalContentSize.THIRD.span, + spanY = 3, + spanYNew = 1, ), ) .inOrder() @@ -352,7 +364,8 @@ class CommunalWidgetDaoTest : SysuiTestCase() { componentName = fakeWidget.componentName, itemId = rank.uid, userSerialNumber = fakeWidget.userSerialNumber, - spanY = 3, + spanY = fakeWidget.spanY.coerceAtLeast(3), + spanYNew = fakeWidget.spanYNew.coerceAtLeast(1), ) expected[rank] = widget } @@ -366,6 +379,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { provider = metadata.provider, rank = rank ?: metadata.rank, userSerialNumber = metadata.userSerialNumber, + spanY = metadata.spanY, ) } @@ -374,6 +388,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { val provider: ComponentName, val rank: Int, val userSerialNumber: Int, + val spanY: SpanValue, ) companion object { @@ -383,6 +398,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { provider = ComponentName("pk_name", "cls_name_1"), rank = 0, userSerialNumber = 0, + spanY = SpanValue.Responsive(1), ) val widgetInfo2 = FakeWidgetMetadata( @@ -390,6 +406,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { provider = ComponentName("pk_name", "cls_name_2"), rank = 1, userSerialNumber = 0, + spanY = SpanValue.Responsive(1), ) val widgetInfo3 = FakeWidgetMetadata( @@ -397,6 +414,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { provider = ComponentName("pk_name", "cls_name_3"), rank = 2, userSerialNumber = 10, + spanY = SpanValue.Responsive(1), ) val communalItemRankEntry1 = CommunalItemRank(uid = 1L, rank = widgetInfo1.rank) val communalItemRankEntry2 = CommunalItemRank(uid = 2L, rank = widgetInfo2.rank) @@ -409,6 +427,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { itemId = communalItemRankEntry1.uid, userSerialNumber = widgetInfo1.userSerialNumber, spanY = 3, + spanYNew = 1, ) val communalWidgetItemEntry2 = CommunalWidgetItem( @@ -418,6 +437,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { itemId = communalItemRankEntry2.uid, userSerialNumber = widgetInfo2.userSerialNumber, spanY = 3, + spanYNew = 1, ) val communalWidgetItemEntry3 = CommunalWidgetItem( @@ -427,6 +447,7 @@ class CommunalWidgetDaoTest : SysuiTestCase() { itemId = communalItemRankEntry3.uid, userSerialNumber = widgetInfo3.userSerialNumber, spanY = 3, + spanYNew = 1, ) val fakeState = CommunalHubState().apply { @@ -437,12 +458,14 @@ class CommunalWidgetDaoTest : SysuiTestCase() { componentName = "pk_name/fake_widget_1" rank = 1 userSerialNumber = 0 + spanY = 3 }, CommunalHubState.CommunalWidgetItem().apply { widgetId = 2 componentName = "pk_name/fake_widget_2" rank = 2 userSerialNumber = 10 + spanYNew = 1 }, ) .toTypedArray() diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java index 492d5f3657da..194f4560bb19 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java @@ -278,7 +278,8 @@ public class KeyguardViewMediatorTest extends SysuiTestCase { mUserTracker, mKosmos.getNotificationShadeWindowModel(), mSecureSettings, - mKosmos::getCommunalInteractor); + mKosmos::getCommunalInteractor, + mKosmos.getShadeLayoutParams()); mFeatureFlags = new FakeFeatureFlags(); mSetFlagsRule.disableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR); diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt index d88b75896a58..266cb51cc855 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt @@ -181,11 +181,9 @@ internal class NoteTaskInitializerTest : SysuiTestCase() { @Test @EnableFlags(com.android.hardware.input.Flags.FLAG_USE_KEY_GESTURE_EVENT_HANDLER) - fun handlesShortcut_metaCtrlN() { + fun handlesShortcut_keyGestureTypeOpenNotes() { val gestureEvent = KeyGestureEvent.Builder() - .setKeycodes(intArrayOf(KeyEvent.KEYCODE_N)) - .setModifierState(KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON) .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_OPEN_NOTES) .setAction(KeyGestureEvent.ACTION_GESTURE_COMPLETE) .build() diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileRequestDialogTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileRequestDialogTest.kt index 2db5e83cf185..d058484de204 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileRequestDialogTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileRequestDialogTest.kt @@ -28,13 +28,14 @@ import android.widget.ImageView import android.widget.TextView import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest -import com.android.systemui.res.R import com.android.systemui.SysuiTestCase import com.android.systemui.plugins.qs.QSTileView +import com.android.systemui.res.R import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.eq import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat +import java.util.Arrays import org.junit.After import org.junit.Before import org.junit.Test @@ -45,7 +46,6 @@ import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations -import java.util.Arrays @SmallTest @RunWith(AndroidJUnit4::class) @@ -62,16 +62,13 @@ class TileRequestDialogTest : SysuiTestCase() { private lateinit var dialog: TileRequestDialog - @Mock - private lateinit var ugm: IUriGrantsManager + @Mock private lateinit var ugm: IUriGrantsManager @Before fun setUp() { MockitoAnnotations.initMocks(this) // Create in looper so we can make sure that the tile is fully updated - TestableLooper.get(this).runWithLooper { - dialog = TileRequestDialog(mContext) - } + TestableLooper.get(this).runWithLooper { dialog = TileRequestDialog(mContext) } } @After @@ -84,7 +81,7 @@ class TileRequestDialogTest : SysuiTestCase() { @Test fun setTileData_hasCorrectViews() { val icon = Icon.createWithResource(mContext, R.drawable.cloud) - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -99,7 +96,7 @@ class TileRequestDialogTest : SysuiTestCase() { @Test fun setTileData_hasCorrectAppName() { val icon = Icon.createWithResource(mContext, R.drawable.cloud) - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -112,7 +109,7 @@ class TileRequestDialogTest : SysuiTestCase() { @Test fun setTileData_hasCorrectLabel() { val icon = Icon.createWithResource(mContext, R.drawable.cloud) - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -127,7 +124,7 @@ class TileRequestDialogTest : SysuiTestCase() { @Test fun setTileData_hasIcon() { val icon = Icon.createWithResource(mContext, R.drawable.cloud) - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -141,7 +138,7 @@ class TileRequestDialogTest : SysuiTestCase() { @Test fun setTileData_nullIcon_hasIcon() { - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, null, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, null, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -156,7 +153,7 @@ class TileRequestDialogTest : SysuiTestCase() { @Test fun setTileData_hasNoStateDescription() { val icon = Icon.createWithResource(mContext, R.drawable.cloud) - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -172,7 +169,7 @@ class TileRequestDialogTest : SysuiTestCase() { @Test fun setTileData_tileNotClickable() { val icon = Icon.createWithResource(mContext, R.drawable.cloud) - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -189,7 +186,7 @@ class TileRequestDialogTest : SysuiTestCase() { @Test fun setTileData_tileHasCorrectContentDescription() { val icon = Icon.createWithResource(mContext, R.drawable.cloud) - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -206,20 +203,14 @@ class TileRequestDialogTest : SysuiTestCase() { fun uriIconLoadSuccess_correctIcon() { val tintColor = Color.BLACK val icon = Mockito.mock(Icon::class.java) - val drawable = context.getDrawable(R.drawable.cloud)!!.apply { - setTint(tintColor) - } + val drawable = context.getDrawable(R.drawable.cloud)!!.apply { setTint(tintColor) } whenever(icon.loadDrawable(any())).thenReturn(drawable) - whenever(icon.loadDrawableCheckingUriGrant( - any(), - eq(ugm), - anyInt(), - anyString()) - ).thenReturn(drawable) + whenever(icon.loadDrawableCheckingUriGrant(any(), eq(ugm), anyInt(), anyString())) + .thenReturn(drawable) val size = 100 - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -231,9 +222,7 @@ class TileRequestDialogTest : SysuiTestCase() { val content = dialog.requireViewById<ViewGroup>(TileRequestDialog.CONTENT_ID) val tile = content.getChildAt(1) as QSTileView - val iconDrawable = (tile.icon.iconView as ImageView).drawable.apply { - setTint(tintColor) - } + val iconDrawable = (tile.icon.iconView as ImageView).drawable.apply { setTint(tintColor) } assertThat(areDrawablesEqual(iconDrawable, drawable, size)).isTrue() } @@ -242,20 +231,14 @@ class TileRequestDialogTest : SysuiTestCase() { fun uriIconLoadFail_defaultIcon() { val tintColor = Color.BLACK val icon = Mockito.mock(Icon::class.java) - val drawable = context.getDrawable(R.drawable.cloud)!!.apply { - setTint(tintColor) - } + val drawable = context.getDrawable(R.drawable.cloud)!!.apply { setTint(tintColor) } whenever(icon.loadDrawable(any())).thenReturn(drawable) - whenever(icon.loadDrawableCheckingUriGrant( - any(), - eq(ugm), - anyInt(), - anyString()) - ).thenReturn(null) + whenever(icon.loadDrawableCheckingUriGrant(any(), eq(ugm), anyInt(), anyString())) + .thenReturn(null) val size = 100 - val tileData = TileRequestDialog.TileData(UID, APP_NAME, LABEL, icon, PACKAGE) + val tileData = TileData(UID, APP_NAME, LABEL, icon, PACKAGE) dialog.setTileData(tileData, ugm) dialog.show() @@ -267,13 +250,9 @@ class TileRequestDialogTest : SysuiTestCase() { val content = dialog.requireViewById<ViewGroup>(TileRequestDialog.CONTENT_ID) val tile = content.getChildAt(1) as QSTileView - val iconDrawable = (tile.icon.iconView as ImageView).drawable.apply { - setTint(tintColor) - } + val iconDrawable = (tile.icon.iconView as ImageView).drawable.apply { setTint(tintColor) } - val defaultIcon = context.getDrawable(DEFAULT_ICON)!!.apply { - setTint(tintColor) - } + val defaultIcon = context.getDrawable(DEFAULT_ICON)!!.apply { setTint(tintColor) } assertThat(areDrawablesEqual(iconDrawable, defaultIcon, size)).isTrue() } @@ -308,4 +287,3 @@ private fun equalBitmaps(a: Bitmap, b: Bitmap): Boolean { b.getPixels(bPix, 0, w, 0, 0, w, h) return Arrays.equals(aPix, bPix) } - diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServiceRequestControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServiceRequestControllerTestComposeOff.kt index 89ec687ad123..82e247714794 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServiceRequestControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/external/TileServiceRequestControllerTestComposeOff.kt @@ -22,6 +22,7 @@ import android.content.ComponentName import android.content.DialogInterface import android.graphics.drawable.Icon import android.os.RemoteException +import android.platform.test.annotations.DisableFlags import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.SmallTest import com.android.internal.logging.InstanceId @@ -29,8 +30,12 @@ import com.android.internal.statusbar.IAddTileResultCallback import com.android.systemui.InstanceIdSequenceFake import com.android.systemui.SysuiTestCase import com.android.systemui.qs.QSHost +import com.android.systemui.qs.external.ui.dialog.tileRequestDialogComposeDelegateFactory +import com.android.systemui.qs.flags.QSComposeFragment +import com.android.systemui.shade.shared.flag.DualShade import com.android.systemui.statusbar.CommandQueue import com.android.systemui.statusbar.commandline.CommandRegistry +import com.android.systemui.testKosmos import com.android.systemui.util.mockito.any import com.android.systemui.util.mockito.capture import com.android.systemui.util.mockito.eq @@ -52,7 +57,8 @@ import org.mockito.MockitoAnnotations @SmallTest @RunWith(AndroidJUnit4::class) -class TileServiceRequestControllerTest : SysuiTestCase() { +@DisableFlags(value = [QSComposeFragment.FLAG_NAME, DualShade.FLAG_NAME]) +class TileServiceRequestControllerTestComposeOff : SysuiTestCase() { companion object { private val TEST_COMPONENT = ComponentName("test_pkg", "test_cls") @@ -61,20 +67,15 @@ class TileServiceRequestControllerTest : SysuiTestCase() { private const val TEST_UID = 12345 } - @Mock - private lateinit var tileRequestDialog: TileRequestDialog - @Mock - private lateinit var qsHost: QSHost - @Mock - private lateinit var commandRegistry: CommandRegistry - @Mock - private lateinit var commandQueue: CommandQueue - @Mock - private lateinit var logger: TileRequestDialogEventLogger - @Mock - private lateinit var icon: Icon - @Mock - private lateinit var ugm: IUriGrantsManager + private val kosmos = testKosmos() + + @Mock private lateinit var tileRequestDialog: TileRequestDialog + @Mock private lateinit var qsHost: QSHost + @Mock private lateinit var commandRegistry: CommandRegistry + @Mock private lateinit var commandQueue: CommandQueue + @Mock private lateinit var logger: TileRequestDialogEventLogger + @Mock private lateinit var icon: Icon + @Mock private lateinit var ugm: IUriGrantsManager private val instanceIdSequence = InstanceIdSequenceFake(1_000) private lateinit var controller: TileServiceRequestController @@ -88,15 +89,17 @@ class TileServiceRequestControllerTest : SysuiTestCase() { // Tile not present by default `when`(qsHost.indexOf(anyString())).thenReturn(-1) - controller = TileServiceRequestController( + controller = + TileServiceRequestController( qsHost, commandQueue, commandRegistry, logger, ugm, - ) { - tileRequestDialog - } + kosmos.tileRequestDialogComposeDelegateFactory, + ) { + tileRequestDialog + } controller.init() } @@ -104,24 +107,19 @@ class TileServiceRequestControllerTest : SysuiTestCase() { @Test fun requestTileAdd_dataIsPassedToDialog() { controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - Callback(), + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + Callback(), ) - verify(tileRequestDialog).setTileData( - TileRequestDialog.TileData( - TEST_UID, - TEST_APP_NAME, - TEST_LABEL, - icon, - TEST_COMPONENT.packageName, - ), + verify(tileRequestDialog) + .setTileData( + TileData(TEST_UID, TEST_APP_NAME, TEST_LABEL, icon, TEST_COMPONENT.packageName), ugm, - ) + ) } @Test @@ -130,12 +128,12 @@ class TileServiceRequestControllerTest : SysuiTestCase() { val callback = Callback() controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - callback, + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + callback, ) assertThat(callback.lastAccepted).isEqualTo(TileServiceRequestController.TILE_ALREADY_ADDED) @@ -156,12 +154,12 @@ class TileServiceRequestControllerTest : SysuiTestCase() { @Test fun showAllUsers_set() { controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - Callback(), + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + Callback(), ) verify(tileRequestDialog).setShowForAllUsers(true) } @@ -169,12 +167,12 @@ class TileServiceRequestControllerTest : SysuiTestCase() { @Test fun cancelOnTouchOutside_set() { controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - Callback(), + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + Callback(), ) verify(tileRequestDialog).setCanceledOnTouchOutside(true) } @@ -189,16 +187,16 @@ class TileServiceRequestControllerTest : SysuiTestCase() { @Test fun cancelListener_dismissResult() { val cancelListenerCaptor = - ArgumentCaptor.forClass(DialogInterface.OnCancelListener::class.java) + ArgumentCaptor.forClass(DialogInterface.OnCancelListener::class.java) val callback = Callback() controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - callback, + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + callback, ) verify(tileRequestDialog).setOnCancelListener(capture(cancelListenerCaptor)) @@ -210,7 +208,7 @@ class TileServiceRequestControllerTest : SysuiTestCase() { @Test fun dialogCancelled_logged() { val cancelListenerCaptor = - ArgumentCaptor.forClass(DialogInterface.OnCancelListener::class.java) + ArgumentCaptor.forClass(DialogInterface.OnCancelListener::class.java) controller.requestTileAdd(TEST_UID, TEST_COMPONENT, TEST_APP_NAME, TEST_LABEL, icon) {} val instanceId = InstanceId.fakeInstanceId(instanceIdSequence.lastInstanceId) @@ -219,26 +217,27 @@ class TileServiceRequestControllerTest : SysuiTestCase() { verify(logger).logDialogShown(TEST_COMPONENT.packageName, instanceId) cancelListenerCaptor.value.onCancel(tileRequestDialog) - verify(logger).logUserResponse( + verify(logger) + .logUserResponse( StatusBarManager.TILE_ADD_REQUEST_RESULT_DIALOG_DISMISSED, TEST_COMPONENT.packageName, - instanceId - ) + instanceId, + ) } @Test fun positiveActionListener_tileAddedResult() { val clickListenerCaptor = - ArgumentCaptor.forClass(DialogInterface.OnClickListener::class.java) + ArgumentCaptor.forClass(DialogInterface.OnClickListener::class.java) val callback = Callback() controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - callback, + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + callback, ) verify(tileRequestDialog).setPositiveButton(anyInt(), capture(clickListenerCaptor)) @@ -251,7 +250,7 @@ class TileServiceRequestControllerTest : SysuiTestCase() { @Test fun tileAdded_logged() { val clickListenerCaptor = - ArgumentCaptor.forClass(DialogInterface.OnClickListener::class.java) + ArgumentCaptor.forClass(DialogInterface.OnClickListener::class.java) controller.requestTileAdd(TEST_UID, TEST_COMPONENT, TEST_APP_NAME, TEST_LABEL, icon) {} val instanceId = InstanceId.fakeInstanceId(instanceIdSequence.lastInstanceId) @@ -260,26 +259,27 @@ class TileServiceRequestControllerTest : SysuiTestCase() { verify(logger).logDialogShown(TEST_COMPONENT.packageName, instanceId) clickListenerCaptor.value.onClick(tileRequestDialog, DialogInterface.BUTTON_POSITIVE) - verify(logger).logUserResponse( + verify(logger) + .logUserResponse( StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ADDED, TEST_COMPONENT.packageName, - instanceId - ) + instanceId, + ) } @Test fun negativeActionListener_tileNotAddedResult() { val clickListenerCaptor = - ArgumentCaptor.forClass(DialogInterface.OnClickListener::class.java) + ArgumentCaptor.forClass(DialogInterface.OnClickListener::class.java) val callback = Callback() controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - callback, + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + callback, ) verify(tileRequestDialog).setNegativeButton(anyInt(), capture(clickListenerCaptor)) @@ -292,7 +292,7 @@ class TileServiceRequestControllerTest : SysuiTestCase() { @Test fun tileNotAdded_logged() { val clickListenerCaptor = - ArgumentCaptor.forClass(DialogInterface.OnClickListener::class.java) + ArgumentCaptor.forClass(DialogInterface.OnClickListener::class.java) controller.requestTileAdd(TEST_UID, TEST_COMPONENT, TEST_APP_NAME, TEST_LABEL, icon) {} val instanceId = InstanceId.fakeInstanceId(instanceIdSequence.lastInstanceId) @@ -301,11 +301,12 @@ class TileServiceRequestControllerTest : SysuiTestCase() { verify(logger).logDialogShown(TEST_COMPONENT.packageName, instanceId) clickListenerCaptor.value.onClick(tileRequestDialog, DialogInterface.BUTTON_NEGATIVE) - verify(logger).logUserResponse( + verify(logger) + .logUserResponse( StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_NOT_ADDED, TEST_COMPONENT.packageName, - instanceId - ) + instanceId, + ) } @Test @@ -319,24 +320,19 @@ class TileServiceRequestControllerTest : SysuiTestCase() { verify(commandQueue, atLeastOnce()).addCallback(capture(captor)) captor.value.requestAddTile( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - Callback(), + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + Callback(), ) - verify(tileRequestDialog).setTileData( - TileRequestDialog.TileData( - TEST_UID, - TEST_APP_NAME, - TEST_LABEL, - icon, - TEST_COMPONENT.packageName, - ), + verify(tileRequestDialog) + .setTileData( + TileData(TEST_UID, TEST_APP_NAME, TEST_LABEL, icon, TEST_COMPONENT.packageName), ugm, - ) + ) } @Test @@ -354,22 +350,23 @@ class TileServiceRequestControllerTest : SysuiTestCase() { @Test fun interfaceThrowsRemoteException_doesntCrash() { val cancelListenerCaptor = - ArgumentCaptor.forClass(DialogInterface.OnCancelListener::class.java) + ArgumentCaptor.forClass(DialogInterface.OnCancelListener::class.java) val captor = ArgumentCaptor.forClass(CommandQueue.Callbacks::class.java) verify(commandQueue, atLeastOnce()).addCallback(capture(captor)) - val callback = object : IAddTileResultCallback.Stub() { - override fun onTileRequest(p0: Int) { - throw RemoteException() + val callback = + object : IAddTileResultCallback.Stub() { + override fun onTileRequest(p0: Int) { + throw RemoteException() + } } - } captor.value.requestAddTile( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - callback, + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + callback, ) verify(tileRequestDialog).setOnCancelListener(capture(cancelListenerCaptor)) @@ -383,12 +380,12 @@ class TileServiceRequestControllerTest : SysuiTestCase() { val callback = Callback() controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - callback, + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + callback, ) verify(tileRequestDialog).setOnDismissListener(capture(dismissListenerCaptor)) @@ -407,12 +404,12 @@ class TileServiceRequestControllerTest : SysuiTestCase() { val callback = Callback() controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - callback, + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + callback, ) verify(tileRequestDialog).setPositiveButton(anyInt(), capture(clickListenerCaptor)) verify(tileRequestDialog).setOnDismissListener(capture(dismissListenerCaptor)) @@ -435,12 +432,12 @@ class TileServiceRequestControllerTest : SysuiTestCase() { val callback = Callback() controller.requestTileAdd( - TEST_UID, - TEST_COMPONENT, - TEST_APP_NAME, - TEST_LABEL, - icon, - callback, + TEST_UID, + TEST_COMPONENT, + TEST_APP_NAME, + TEST_LABEL, + icon, + callback, ) verify(tileRequestDialog).setOnCancelListener(capture(cancelListenerCaptor)) verify(tileRequestDialog).setOnDismissListener(capture(dismissListenerCaptor)) diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java index afff4858499a..a17f100904be 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/screenrecord/RecordingControllerTest.java @@ -36,6 +36,7 @@ import android.app.Dialog; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; +import android.media.projection.StopReason; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -154,7 +155,7 @@ public class RecordingControllerTest extends SysuiTestCase { PendingIntent stopIntent = Mockito.mock(PendingIntent.class); mController.startCountdown(0, 0, startIntent, stopIntent); - mController.stopRecording(); + mController.stopRecording(StopReason.STOP_UNKNOWN); assertFalse(mController.isStarting()); assertFalse(mController.isRecording()); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java index d1e4f646a382..3e24fbe6cd8d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragmentTest.java @@ -68,6 +68,7 @@ import com.android.systemui.statusbar.phone.HeadsUpAppearanceController; import com.android.systemui.statusbar.phone.StatusBarHideIconsForBouncerManager; import com.android.systemui.statusbar.phone.fragment.dagger.HomeStatusBarComponent; import com.android.systemui.statusbar.phone.ongoingcall.OngoingCallController; +import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization; import com.android.systemui.statusbar.phone.ui.DarkIconManager; import com.android.systemui.statusbar.phone.ui.StatusBarIconController; import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.FakeHomeStatusBarViewBinder; @@ -155,9 +156,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { any(StatusBarWindowStateListener.class)); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testDisableNone() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testDisableNone() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); fragment.disable(DEFAULT_DISPLAY, 0, 0, false); @@ -166,9 +167,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getClockView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testDisableSystemInfo_systemAnimationIdle_doesHide() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testDisableSystemInfo_systemAnimationIdle_doesHide() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_SYSTEM_INFO, 0, false); @@ -184,9 +185,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getEndSideContentView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testSystemStatusAnimation_startedDisabled_finishedWithAnimator_showsSystemInfo() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testSystemStatusAnimation_startedDisabled_finishedWithAnimator_showsSystemInfo() { // GIVEN the status bar hides the system info via disable flags, while there is no event CollapsedStatusBarFragment fragment = resumeAndGetFragment(); fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_SYSTEM_INFO, 0, false); @@ -214,9 +215,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(1, getEndSideContentView().getAlpha(), 0.01); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testSystemStatusAnimation_systemInfoDisabled_staysInvisible() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testSystemStatusAnimation_systemInfoDisabled_staysInvisible() { // GIVEN the status bar hides the system info via disable flags, while there is no event CollapsedStatusBarFragment fragment = resumeAndGetFragment(); fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_SYSTEM_INFO, 0, false); @@ -231,9 +232,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getEndSideContentView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testSystemStatusAnimation_notDisabled_animatesAlphaZero() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testSystemStatusAnimation_notDisabled_animatesAlphaZero() { // GIVEN the status bar is not disabled CollapsedStatusBarFragment fragment = resumeAndGetFragment(); assertEquals(1, getEndSideContentView().getAlpha(), 0.01); @@ -247,9 +248,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(0, getEndSideContentView().getAlpha(), 0.01); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testSystemStatusAnimation_notDisabled_animatesBackToAlphaOne() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testSystemStatusAnimation_notDisabled_animatesBackToAlphaOne() { // GIVEN the status bar is not disabled CollapsedStatusBarFragment fragment = resumeAndGetFragment(); assertEquals(1, getEndSideContentView().getAlpha(), 0.01); @@ -271,9 +272,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(1, getEndSideContentView().getAlpha(), 0.01); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testDisableNotifications() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testDisableNotifications() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_NOTIFICATION_ICONS, 0, false); @@ -307,9 +308,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getNotificationAreaView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testDisableClock() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testDisableClock() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); fragment.disable(DEFAULT_DISPLAY, StatusBarManager.DISABLE_CLOCK, 0, false); @@ -343,10 +344,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getClockView().getVisibility()); } - @Test - @DisableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_shadeOpenAndShouldHide_everythingHidden() { + @Test + @DisableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_shadeOpenAndShouldHide_everythingHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN the shade is open and configured to hide the status bar icons @@ -361,10 +362,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getEndSideContentView().getVisibility()); } - @Test - @DisableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_shadeOpenButNotShouldHide_everythingShown() { + @Test + @DisableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_shadeOpenButNotShouldHide_everythingShown() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN the shade is open but *not* configured to hide the status bar icons @@ -379,11 +380,11 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getEndSideContentView().getVisibility()); } - /** Regression test for b/279790651. */ - @Test - @DisableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_shadeOpenAndShouldHide_thenShadeNotOpenAndDozingUpdate_everythingShown() { + /** Regression test for b/279790651. */ + @Test + @DisableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_shadeOpenAndShouldHide_thenShadeNotOpenAndDozingUpdate_everythingShown() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN the shade is open and configured to hide the status bar icons @@ -409,9 +410,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getEndSideContentView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_notTransitioningToOccluded_everythingShown() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_notTransitioningToOccluded_everythingShown() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); mCollapsedStatusBarViewModel.isTransitioningFromLockscreenToOccluded().setValue(false); @@ -424,10 +425,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getEndSideContentView().getVisibility()); } - @Test - @DisableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_isTransitioningToOccluded_everythingHidden() { + @Test + @DisableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_isTransitioningToOccluded_everythingHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); mCollapsedStatusBarViewModel.isTransitioningFromLockscreenToOccluded().setValue(true); @@ -440,10 +441,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getEndSideContentView().getVisibility()); } - @Test - @DisableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_wasTransitioningToOccluded_transitionFinished_everythingShown() { + @Test + @DisableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_wasTransitioningToOccluded_transitionFinished_everythingShown() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN the transition is occurring @@ -472,9 +473,13 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getUserChipView().getVisibility()); } - @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) - public void disable_noOngoingCall_chipHidden() { + @Test + @DisableFlags({ + FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void disable_noOngoingCall_chipHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mOngoingCallController.hasOngoingCall()).thenReturn(false); @@ -484,9 +489,13 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) - public void disable_hasOngoingCall_chipDisplayedAndNotificationIconsHidden() { + @Test + @DisableFlags({ + FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void disable_hasOngoingCall_chipDisplayedAndNotificationIconsHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mOngoingCallController.hasOngoingCall()).thenReturn(true); @@ -497,9 +506,13 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getNotificationAreaView().getVisibility()); } - @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) - public void disable_hasOngoingCallButNotificationIconsDisabled_chipHidden() { + @Test + @DisableFlags({ + FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void disable_hasOngoingCallButNotificationIconsDisabled_chipHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mOngoingCallController.hasOngoingCall()).thenReturn(true); @@ -510,9 +523,13 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) - public void disable_hasOngoingCallButAlsoHun_chipHidden() { + @Test + @DisableFlags({ + FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void disable_hasOngoingCallButAlsoHun_chipHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mOngoingCallController.hasOngoingCall()).thenReturn(true); @@ -523,9 +540,13 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) - public void disable_ongoingCallEnded_chipHidden() { + @Test + @DisableFlags({ + FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void disable_ongoingCallEnded_chipHidden() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // Ongoing call started @@ -547,9 +568,13 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) - public void disable_hasOngoingCall_hidesNotifsWithoutAnimation() { + @Test + @DisableFlags({ + FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void disable_hasOngoingCall_hidesNotifsWithoutAnimation() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // Enable animations for testing so that we can verify we still aren't animating fragment.enableAnimationsForTesting(); @@ -564,9 +589,13 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getNotificationAreaView().getVisibility()); } - @Test - @DisableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarRootModernization.FLAG_NAME}) - public void screenSharingChipsDisabled_ignoresNewCallback() { + @Test + @DisableFlags({ + FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void screenSharingChipsDisabled_ignoresNewCallback() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN there *is* an ongoing call via old callback @@ -597,10 +626,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getSecondaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void noOngoingActivity_chipHidden() { + @Test + @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void noOngoingActivity_chipHidden() { resumeAndGetFragment(); // TODO(b/332662551): We *should* be able to just set a value on @@ -615,10 +644,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void hasPrimaryOngoingActivity_primaryChipDisplayedAndNotificationIconsHidden() { + @Test + @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void hasPrimaryOngoingActivity_primaryChipDisplayedAndNotificationIconsHidden() { resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onOngoingActivityStatusChanged( @@ -630,12 +659,14 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getNotificationAreaView().getVisibility()); } - @Test - @EnableFlags({ - FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, - StatusBarNotifChips.FLAG_NAME, - StatusBarRootModernization.FLAG_NAME}) - public void hasPrimaryOngoingActivity_viewsUnchangedWhenRootModernizationFlagOn() { + @Test + @EnableFlags({ + FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, + StatusBarNotifChips.FLAG_NAME, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void hasPrimaryOngoingActivity_viewsUnchangedWhenRootModernizationFlagOn() { resumeAndGetFragment(); assertEquals(View.VISIBLE, getPrimaryOngoingActivityChipView().getVisibility()); @@ -658,10 +689,14 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getNotificationAreaView().getVisibility()); } - @Test - @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) - public void hasSecondaryOngoingActivity_butNotifsFlagOff_secondaryChipHidden() { + @Test + @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) + @DisableFlags({ + StatusBarNotifChips.FLAG_NAME, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void hasSecondaryOngoingActivity_butNotifsFlagOff_secondaryChipHidden() { resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onOngoingActivityStatusChanged( @@ -672,10 +707,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getSecondaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void hasSecondaryOngoingActivity_flagOn_secondaryChipShownAndNotificationIconsHidden() { + @Test + @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void hasSecondaryOngoingActivity_flagOn_secondaryChipShownAndNotificationIconsHidden() { resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onOngoingActivityStatusChanged( @@ -687,10 +722,14 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getNotificationAreaView().getVisibility()); } - @Test - @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) - public void hasOngoingActivityButNotificationIconsDisabled_chipHidden_notifsFlagOff() { + @Test + @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) + @DisableFlags({ + StatusBarNotifChips.FLAG_NAME, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void hasOngoingActivityButNotificationIconsDisabled_chipHidden_notifsFlagOff() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onOngoingActivityStatusChanged( @@ -704,10 +743,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void hasOngoingActivitiesButNotificationIconsDisabled_chipsHidden_notifsFlagOn() { + @Test + @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void hasOngoingActivitiesButNotificationIconsDisabled_chipsHidden_notifsFlagOn() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onOngoingActivityStatusChanged( @@ -722,10 +761,14 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getSecondaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) - public void hasOngoingActivityButAlsoHun_chipHidden_notifsFlagOff() { + @Test + @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) + @DisableFlags({ + StatusBarNotifChips.FLAG_NAME, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void hasOngoingActivityButAlsoHun_chipHidden_notifsFlagOff() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onOngoingActivityStatusChanged( @@ -739,10 +782,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void hasOngoingActivitiesButAlsoHun_chipsHidden_notifsFlagOn() { + @Test + @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void hasOngoingActivitiesButAlsoHun_chipsHidden_notifsFlagOn() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onOngoingActivityStatusChanged( @@ -757,10 +800,14 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getSecondaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) - public void primaryOngoingActivityEnded_chipHidden_notifsFlagOff() { + @Test + @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) + @DisableFlags({ + StatusBarNotifChips.FLAG_NAME, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void primaryOngoingActivityEnded_chipHidden_notifsFlagOff() { resumeAndGetFragment(); // Ongoing activity started @@ -780,10 +827,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void primaryOngoingActivityEnded_chipHidden_notifsFlagOn() { + @Test + @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void primaryOngoingActivityEnded_chipHidden_notifsFlagOn() { resumeAndGetFragment(); // Ongoing activity started @@ -803,10 +850,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void secondaryOngoingActivityEnded_chipHidden() { + @Test + @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void secondaryOngoingActivityEnded_chipHidden() { resumeAndGetFragment(); // Secondary ongoing activity started @@ -826,10 +873,14 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getSecondaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) - public void hasOngoingActivity_hidesNotifsWithoutAnimation_notifsFlagOff() { + @Test + @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) + @DisableFlags({ + StatusBarNotifChips.FLAG_NAME, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void hasOngoingActivity_hidesNotifsWithoutAnimation_notifsFlagOff() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // Enable animations for testing so that we can verify we still aren't animating fragment.enableAnimationsForTesting(); @@ -845,10 +896,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getNotificationAreaView().getVisibility()); } - @Test - @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void hasOngoingActivity_hidesNotifsWithoutAnimation_notifsFlagOn() { + @Test + @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void hasOngoingActivity_hidesNotifsWithoutAnimation_notifsFlagOn() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // Enable animations for testing so that we can verify we still aren't animating fragment.enableAnimationsForTesting(); @@ -864,10 +915,14 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getNotificationAreaView().getVisibility()); } - @Test - @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) - @DisableFlags({StatusBarNotifChips.FLAG_NAME, StatusBarRootModernization.FLAG_NAME}) - public void screenSharingChipsEnabled_ignoresOngoingCallController_notifsFlagOff() { + @Test + @EnableFlags(FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS) + @DisableFlags({ + StatusBarNotifChips.FLAG_NAME, + StatusBarRootModernization.FLAG_NAME, + StatusBarChipsModernization.FLAG_NAME + }) + public void screenSharingChipsEnabled_ignoresOngoingCallController_notifsFlagOff() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN there *is* an ongoing call via old callback @@ -897,10 +952,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getPrimaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void screenSharingChipsEnabled_ignoresOngoingCallController_notifsFlagOn() { + @Test + @EnableFlags({FLAG_STATUS_BAR_SCREEN_SHARING_CHIPS, StatusBarNotifChips.FLAG_NAME}) + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void screenSharingChipsEnabled_ignoresOngoingCallController_notifsFlagOn() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN there *is* an ongoing call via old callback @@ -931,10 +986,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getSecondaryOngoingActivityChipView().getVisibility()); } - @Test - @EnableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void isHomeStatusBarAllowedByScene_false_everythingHidden() { + @Test + @EnableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void isHomeStatusBarAllowedByScene_false_everythingHidden() { resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onIsHomeStatusBarAllowedBySceneChanged(false); @@ -945,10 +1000,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getEndSideContentView().getVisibility()); } - @Test - @EnableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void isHomeStatusBarAllowedByScene_true_everythingShown() { + @Test + @EnableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void isHomeStatusBarAllowedByScene_true_everythingShown() { resumeAndGetFragment(); mCollapsedStatusBarViewBinder.getListener().onIsHomeStatusBarAllowedBySceneChanged(true); @@ -959,10 +1014,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getEndSideContentView().getVisibility()); } - @Test - @EnableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_isHomeStatusBarAllowedBySceneFalse_disableValuesIgnored() { + @Test + @EnableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_isHomeStatusBarAllowedBySceneFalse_disableValuesIgnored() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN the scene doesn't allow the status bar @@ -977,10 +1032,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.INVISIBLE, getEndSideContentView().getVisibility()); } - @Test - @EnableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_isHomeStatusBarAllowedBySceneTrue_disableValuesUsed() { + @Test + @EnableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_isHomeStatusBarAllowedBySceneTrue_disableValuesUsed() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN the scene does allow the status bar @@ -995,10 +1050,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getEndSideContentView().getVisibility()); } - @Test - @DisableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void isHomeStatusBarAllowedByScene_sceneContainerDisabled_valueNotUsed() { + @Test + @DisableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void isHomeStatusBarAllowedByScene_sceneContainerDisabled_valueNotUsed() { resumeAndGetFragment(); // Even if the scene says to hide the home status bar @@ -1010,9 +1065,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getEndSideContentView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_isDozing_clockAndSystemInfoVisible() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_isDozing_clockAndSystemInfoVisible() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mStatusBarStateController.isDozing()).thenReturn(true); @@ -1022,9 +1077,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getClockView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_NotDozing_clockAndSystemInfoVisible() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_NotDozing_clockAndSystemInfoVisible() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mStatusBarStateController.isDozing()).thenReturn(false); @@ -1034,9 +1089,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getClockView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_headsUpShouldBeVisibleTrue_clockDisabled() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_headsUpShouldBeVisibleTrue_clockDisabled() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mHeadsUpAppearanceController.shouldBeVisible()).thenReturn(true); @@ -1045,9 +1100,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.GONE, getClockView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void disable_headsUpShouldBeVisibleFalse_clockNotDisabled() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void disable_headsUpShouldBeVisibleFalse_clockNotDisabled() { CollapsedStatusBarFragment fragment = resumeAndGetFragment(); when(mHeadsUpAppearanceController.shouldBeVisible()).thenReturn(false); @@ -1098,10 +1153,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertFalse(contains); } - @Test - @DisableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testStatusBarIcons_hiddenThroughoutCameraLaunch() { + @Test + @DisableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testStatusBarIcons_hiddenThroughoutCameraLaunch() { final CollapsedStatusBarFragment fragment = resumeAndGetFragment(); mockSecureCameraLaunch(fragment, true /* launched */); @@ -1121,10 +1176,10 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getClockView().getVisibility()); } - @Test - @DisableSceneContainer - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testStatusBarIcons_hiddenThroughoutLockscreenToDreamTransition() { + @Test + @DisableSceneContainer + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testStatusBarIcons_hiddenThroughoutLockscreenToDreamTransition() { final CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN a transition to dream has started @@ -1158,9 +1213,9 @@ public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { assertEquals(View.VISIBLE, getClockView().getVisibility()); } - @Test - @DisableFlags(StatusBarRootModernization.FLAG_NAME) - public void testStatusBarIcons_lockscreenToDreamTransitionButNotDreaming_iconsVisible() { + @Test + @DisableFlags({StatusBarRootModernization.FLAG_NAME, StatusBarChipsModernization.FLAG_NAME}) + public void testStatusBarIcons_lockscreenToDreamTransitionButNotDreaming_iconsVisible() { final CollapsedStatusBarFragment fragment = resumeAndGetFragment(); // WHEN a transition to dream has started but we're *not* dreaming diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java index eb91b1e4a89e..192d66c44aa0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java @@ -113,7 +113,7 @@ import com.android.systemui.biometrics.AuthController; import com.android.systemui.colorextraction.SysuiColorExtractor; import com.android.systemui.deviceentry.domain.interactor.DeviceEntryUdfpsInteractor; import com.android.systemui.dump.DumpManager; -import com.android.systemui.flags.FakeFeatureFlags; +import com.android.systemui.flags.FakeFeatureFlagsClassic; import com.android.systemui.flags.SceneContainerFlagParameterizationKt; import com.android.systemui.keyguard.KeyguardViewMediator; import com.android.systemui.kosmos.KosmosJavaAdapter; @@ -368,7 +368,7 @@ public class BubblesTest extends SysuiTestCase { private TestableLooper mTestableLooper; private final FakeDisplayTracker mDisplayTracker = new FakeDisplayTracker(mContext); - private final FakeFeatureFlags mFeatureFlags = new FakeFeatureFlags(); + private final FakeFeatureFlagsClassic mFeatureFlags = new FakeFeatureFlagsClassic(); private UserHandle mUser0; @@ -444,7 +444,8 @@ public class BubblesTest extends SysuiTestCase { mUserTracker, mNotificationShadeWindowModel, new FakeSettings(), - mKosmos::getCommunalInteractor + mKosmos::getCommunalInteractor, + mKosmos.getShadeLayoutParams() ); mNotificationShadeWindowController.fetchWindowRootView(); mNotificationShadeWindowController.attach(); diff --git a/packages/SystemUI/tests/utils/src/android/content/res/ResourcesKosmos.kt b/packages/SystemUI/tests/utils/src/android/content/res/ResourcesKosmos.kt index 56867640d03d..74330c13f47e 100644 --- a/packages/SystemUI/tests/utils/src/android/content/res/ResourcesKosmos.kt +++ b/packages/SystemUI/tests/utils/src/android/content/res/ResourcesKosmos.kt @@ -18,5 +18,8 @@ package android.content.res import android.content.applicationContext import com.android.systemui.kosmos.Kosmos +import org.mockito.Mockito.mock var Kosmos.mainResources: Resources by Kosmos.Fixture { applicationContext.resources } + +var Kosmos.mockResources: Resources by Kosmos.Fixture { mock(Resources::class.java) } diff --git a/packages/SystemUI/tests/utils/src/com/android/app/IUriGrantsManagerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/app/IUriGrantsManagerKosmos.kt new file mode 100644 index 000000000000..003777aca687 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/app/IUriGrantsManagerKosmos.kt @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.app + +import android.app.IUriGrantsManager +import com.android.systemui.kosmos.Kosmos +import org.mockito.kotlin.mock + +val Kosmos.iUriGrantsManager by Kosmos.Fixture { mock<IUriGrantsManager>() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java index 153a8be06adc..3e44364dc6a0 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java @@ -118,6 +118,7 @@ public abstract class SysuiTestCase { android.net.platform.flags.Flags.class, android.os.Flags.class, android.service.controls.flags.Flags.class, + android.service.quickaccesswallet.Flags.class, com.android.internal.telephony.flags.Flags.class, com.android.server.notification.Flags.class, com.android.systemui.Flags.class); diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/communal/data/repository/FakeCommunalWidgetRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/communal/data/repository/FakeCommunalWidgetRepository.kt index 3b175853de7d..1f7f3bc4be2b 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/communal/data/repository/FakeCommunalWidgetRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/communal/data/repository/FakeCommunalWidgetRepository.kt @@ -55,7 +55,7 @@ class FakeCommunalWidgetRepository(private val coroutineScope: CoroutineScope) : rank: Int = 0, category: Int = AppWidgetProviderInfo.WIDGET_CATEGORY_KEYGUARD, userId: Int = 0, - spanY: Int = CommunalContentSize.HALF.span, + spanY: Int = CommunalContentSize.FixedSize.HALF.span, ) { fakeDatabase[appWidgetId] = CommunalWidgetContentModel.Available( @@ -87,7 +87,7 @@ class FakeCommunalWidgetRepository(private val coroutineScope: CoroutineScope) : componentName = ComponentName.unflattenFromString(componentName)!!, icon = icon, user = UserHandle(userId), - spanY = CommunalContentSize.HALF.span, + spanY = CommunalContentSize.FixedSize.HALF.span, ) updateListFromDatabase() } @@ -143,7 +143,7 @@ class FakeCommunalWidgetRepository(private val coroutineScope: CoroutineScope) : appWidgetId = id, providerInfo = providerInfo, rank = rank, - spanY = CommunalContentSize.HALF.span, + spanY = CommunalContentSize.FixedSize.HALF.span, ) updateListFromDatabase() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyboard/shortcut/KeyboardShortcutHelperKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyboard/shortcut/KeyboardShortcutHelperKosmos.kt index 2bff0c66889f..552cd9488657 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyboard/shortcut/KeyboardShortcutHelperKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyboard/shortcut/KeyboardShortcutHelperKosmos.kt @@ -38,6 +38,7 @@ import com.android.systemui.keyboard.shortcut.data.source.SystemShortcutsSource import com.android.systemui.keyboard.shortcut.domain.interactor.ShortcutCustomizationInteractor import com.android.systemui.keyboard.shortcut.domain.interactor.ShortcutHelperCategoriesInteractor import com.android.systemui.keyboard.shortcut.domain.interactor.ShortcutHelperStateInteractor +import com.android.systemui.keyboard.shortcut.shared.model.ShortcutHelperExclusions import com.android.systemui.keyboard.shortcut.ui.ShortcutCustomizationDialogStarter import com.android.systemui.keyboard.shortcut.ui.viewmodel.ShortcutCustomizationViewModel import com.android.systemui.keyboard.shortcut.ui.viewmodel.ShortcutHelperViewModel @@ -80,12 +81,16 @@ var Kosmos.shortcutHelperInputShortcutsSource: KeyboardShortcutGroupsSource by var Kosmos.shortcutHelperCurrentAppShortcutsSource: KeyboardShortcutGroupsSource by Kosmos.Fixture { CurrentAppShortcutsSource(windowManager) } +val Kosmos.shortcutHelperExclusions by + Kosmos.Fixture { ShortcutHelperExclusions(applicationContext) } + val Kosmos.shortcutCategoriesUtils by Kosmos.Fixture { ShortcutCategoriesUtils( applicationContext, backgroundCoroutineContext, fakeInputManager.inputManager, + shortcutHelperExclusions, ) } @@ -107,9 +112,8 @@ val Kosmos.defaultShortcutCategoriesRepository by val Kosmos.inputGestureMaps by Kosmos.Fixture { InputGestureMaps(applicationContext) } -val Kosmos.customInputGesturesRepository by Kosmos.Fixture { - CustomInputGesturesRepository(userTracker, testDispatcher) -} +val Kosmos.customInputGesturesRepository by + Kosmos.Fixture { CustomInputGesturesRepository(userTracker, testDispatcher) } val Kosmos.customShortcutCategoriesRepository by Kosmos.Fixture { @@ -121,7 +125,7 @@ val Kosmos.customShortcutCategoriesRepository by applicationContext, inputGestureMaps, customInputGesturesRepository, - fakeInputManager.inputManager + fakeInputManager.inputManager, ) } @@ -160,6 +164,7 @@ val Kosmos.shortcutHelperCategoriesInteractor by val Kosmos.shortcutHelperViewModel by Kosmos.Fixture { ShortcutHelperViewModel( + applicationContext, mockRoleManager, userTracker, applicationCoroutineScope, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissInteractorKosmos.kt index ace11573c7c6..339210c07437 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/domain/interactor/KeyguardDismissInteractorKosmos.kt @@ -38,8 +38,8 @@ val Kosmos.keyguardDismissInteractor by primaryBouncerInteractor = primaryBouncerInteractor, selectedUserInteractor = selectedUserInteractor, dismissCallbackRegistry = dismissCallbackRegistry, - trustRepository = trustRepository, alternateBouncerInteractor = alternateBouncerInteractor, + trustRepository = trustRepository, powerInteractor = powerInteractor, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/GeneralKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/GeneralKosmos.kt index 1556058d51ba..7ee9d84d84fb 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/GeneralKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/GeneralKosmos.kt @@ -8,7 +8,10 @@ import com.android.systemui.kosmos.Kosmos.Fixture import com.android.systemui.settings.brightness.ui.BrightnessWarningToast import com.android.systemui.util.mockito.mock import kotlin.coroutines.CoroutineContext +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.launch import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.UnconfinedTestDispatcher @@ -58,3 +61,27 @@ fun Kosmos.runCurrent() = testScope.runCurrent() fun <T> Kosmos.collectLastValue(flow: Flow<T>) = testScope.collectLastValue(flow) fun <T> Kosmos.collectValues(flow: Flow<T>): FlowValue<List<T>> = testScope.collectValues(flow) + +/** + * Retrieve the current value of this [StateFlow] safely. Needs a [TestScope] in order to make sure + * that all pending tasks have run before returning a value. Tests that directly access + * [StateFlow.value] may be incorrect, since the value returned may be stale if the current test + * dispatcher is a [StandardTestDispatcher]. + * + * If you want to assert on a [Flow] that is not a [StateFlow], please use + * [TestScope.collectLastValue], to make sure that the desired value is captured when emitted. + */ +@OptIn(ExperimentalCoroutinesApi::class) +fun <T> TestScope.currentValue(stateFlow: StateFlow<T>): T { + val values = mutableListOf<T>() + val job = backgroundScope.launch { stateFlow.collect(values::add) } + runCurrent() + job.cancel() + // StateFlow should always have at least one value + return values.last() +} + +/** Retrieve the current value of this [StateFlow] safely. See `currentValue(TestScope)`. */ +fun <T> Kosmos.currentValue(stateFlow: StateFlow<T>): T { + return testScope.currentValue(stateFlow) +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt index 5b2c8dda2475..41cfceaa5e38 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/kosmos/KosmosJavaAdapter.kt @@ -66,6 +66,7 @@ import com.android.systemui.scene.shared.model.sceneDataSource import com.android.systemui.settings.brightness.domain.interactor.brightnessMirrorShowingInteractor import com.android.systemui.shade.data.repository.shadeRepository import com.android.systemui.shade.domain.interactor.shadeInteractor +import com.android.systemui.shade.domain.interactor.shadeLayoutParams import com.android.systemui.shade.domain.interactor.shadeModeInteractor import com.android.systemui.shade.shadeController import com.android.systemui.shade.ui.viewmodel.notificationShadeWindowModel @@ -133,6 +134,7 @@ class KosmosJavaAdapter() { val simBouncerInteractor by lazy { kosmos.simBouncerInteractor } val statusBarStateController by lazy { kosmos.statusBarStateController } val statusBarModePerDisplayRepository by lazy { kosmos.fakeStatusBarModePerDisplayRepository } + val shadeLayoutParams by lazy { kosmos.shadeLayoutParams } val autoHideControllerStore by lazy { kosmos.fakeAutoHideControllerStore } val interactionJankMonitor by lazy { kosmos.interactionJankMonitor } val fakeSceneContainerConfig by lazy { kosmos.sceneContainerConfig } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryKosmos.kt index 7a04aa288dce..7964c1114be5 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/media/controls/data/repository/MediaFilterRepositoryKosmos.kt @@ -19,7 +19,6 @@ package com.android.systemui.media.controls.data.repository import android.content.applicationContext import com.android.systemui.kosmos.Kosmos import com.android.systemui.media.controls.util.mediaSmartspaceLogger -import com.android.systemui.statusbar.policy.configurationController import com.android.systemui.util.time.systemClock val Kosmos.mediaFilterRepository by @@ -27,7 +26,6 @@ val Kosmos.mediaFilterRepository by MediaFilterRepository( applicationContext = applicationContext, systemClock = systemClock, - configurationController = configurationController, smartspaceLogger = mediaSmartspaceLogger, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/mediarouter/data/repository/FakeMediaRouterRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/mediarouter/data/repository/FakeMediaRouterRepository.kt index 8aa7a03710cb..d5637cbe36b5 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/mediarouter/data/repository/FakeMediaRouterRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/mediarouter/data/repository/FakeMediaRouterRepository.kt @@ -16,6 +16,7 @@ package com.android.systemui.mediarouter.data.repository +import android.media.projection.StopReason import com.android.systemui.statusbar.policy.CastDevice import kotlinx.coroutines.flow.MutableStateFlow @@ -25,7 +26,7 @@ class FakeMediaRouterRepository : MediaRouterRepository { var lastStoppedDevice: CastDevice? = null private set - override fun stopCasting(device: CastDevice) { + override fun stopCasting(device: CastDevice, @StopReason stopReason: Int) { lastStoppedDevice = device } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QSHostAdapterKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QSHostAdapterKosmos.kt new file mode 100644 index 000000000000..0bf801b35ad1 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/QSHostAdapterKosmos.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs + +import android.content.applicationContext +import com.android.systemui.dump.dumpManager +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.qs.external.tileServiceRequestControllerBuilder +import com.android.systemui.qs.pipeline.domain.interactor.currentTilesInteractor + +val Kosmos.qsHostAdapter by + Kosmos.Fixture { + QSHostAdapter( + currentTilesInteractor, + applicationContext, + tileServiceRequestControllerBuilder, + applicationCoroutineScope, + dumpManager, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/TileServiceRequestControllerKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/TileServiceRequestControllerKosmos.kt new file mode 100644 index 000000000000..296623462a54 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/TileServiceRequestControllerKosmos.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external + +import com.android.app.iUriGrantsManager +import com.android.internal.logging.uiEventLoggerFake +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.qs.external.ui.dialog.tileRequestDialogComposeDelegateFactory +import com.android.systemui.qs.instanceIdSequenceFake +import com.android.systemui.qs.qsHostAdapter +import com.android.systemui.statusbar.commandQueue +import com.android.systemui.statusbar.commandline.commandRegistry +import org.mockito.kotlin.mock + +val Kosmos.tileServiceRequestControllerBuilder by + Kosmos.Fixture { + TileServiceRequestController.Builder( + commandQueue, + commandRegistry, + iUriGrantsManager, + tileRequestDialogComposeDelegateFactory, + ) + } + +val Kosmos.tileServiceRequestController by + Kosmos.Fixture { + TileServiceRequestController( + qsHostAdapter, + commandQueue, + commandRegistry, + TileRequestDialogEventLogger(uiEventLoggerFake, instanceIdSequenceFake), + iUriGrantsManager, + tileRequestDialogComposeDelegateFactory, + { mock() }, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/dialog/FakeTileRequestDialogComposeDelegateFactory.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/dialog/FakeTileRequestDialogComposeDelegateFactory.kt new file mode 100644 index 000000000000..1e0ebe44ba2a --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/dialog/FakeTileRequestDialogComposeDelegateFactory.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external.ui.dialog + +import android.content.DialogInterface +import com.android.systemui.qs.external.TileData +import org.mockito.Answers +import org.mockito.kotlin.mock + +class FakeTileRequestDialogComposeDelegateFactory : TileRequestDialogComposeDelegate.Factory { + lateinit var tileData: TileData + lateinit var clickListener: DialogInterface.OnClickListener + + override fun create( + tileData: TileData, + dialogListener: DialogInterface.OnClickListener, + ): TileRequestDialogComposeDelegate { + this.tileData = tileData + this.clickListener = dialogListener + return mock(defaultAnswer = Answers.RETURNS_MOCKS) + } +} diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/dialog/TileRequestDialogComposeDelegateKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/dialog/TileRequestDialogComposeDelegateKosmos.kt new file mode 100644 index 000000000000..030af61e5569 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/dialog/TileRequestDialogComposeDelegateKosmos.kt @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external.ui.dialog + +import android.content.DialogInterface +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.qs.external.TileData +import com.android.systemui.qs.external.ui.viewmodel.tileRequestDialogViewModelFactory +import com.android.systemui.statusbar.phone.systemUIDialogFactory + +var Kosmos.tileRequestDialogComposeDelegateFactory by + Kosmos.Fixture<TileRequestDialogComposeDelegate.Factory> { + object : TileRequestDialogComposeDelegate.Factory { + override fun create( + tiledata: TileData, + dialogListener: DialogInterface.OnClickListener, + ): TileRequestDialogComposeDelegate { + return TileRequestDialogComposeDelegate( + systemUIDialogFactory, + tileRequestDialogViewModelFactory, + tiledata, + dialogListener, + ) + } + } + } + +val TileRequestDialogComposeDelegate.Factory.fake: FakeTileRequestDialogComposeDelegateFactory + get() = this as FakeTileRequestDialogComposeDelegateFactory diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModelKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModelKosmos.kt new file mode 100644 index 000000000000..7b1797db24f7 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/external/ui/viewmodel/TileRequestDialogViewModelKosmos.kt @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.qs.external.ui.viewmodel + +import android.content.Context +import com.android.app.iUriGrantsManager +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testDispatcher +import com.android.systemui.qs.external.TileData + +val Kosmos.tileRequestDialogViewModelFactory by + Kosmos.Fixture { + object : TileRequestDialogViewModel.Factory { + override fun create( + dialogContext: Context, + tileData: TileData, + ): TileRequestDialogViewModel { + return TileRequestDialogViewModel( + iUriGrantsManager, + testDispatcher, + dialogContext, + tileData, + ) + } + } + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapterKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapterKosmos.kt index a90876551d20..de9f629ef787 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapterKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/qs/tiles/viewmodel/QSTileViewModelAdapterKosmos.kt @@ -18,6 +18,7 @@ package com.android.systemui.qs.tiles.viewmodel import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.kosmos.testDispatcher import com.android.systemui.util.mockito.mock val Kosmos.qsTileViewModelAdaperFactory by @@ -28,6 +29,7 @@ val Kosmos.qsTileViewModelAdaperFactory by applicationCoroutineScope, mock(), qsTileViewModel, + testDispatcher, ) } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/scene/ui/view/WindowRootViewKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/ui/view/WindowRootViewKosmos.kt new file mode 100644 index 000000000000..5c91dc80b3d4 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/scene/ui/view/WindowRootViewKosmos.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.scene.ui.view + +import com.android.systemui.kosmos.Kosmos +import org.mockito.kotlin.mock + +val Kosmos.mockShadeRootView by Kosmos.Fixture { mock<WindowRootView>() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/screenrecord/data/repository/FakeScreenRecordRepository.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/screenrecord/data/repository/FakeScreenRecordRepository.kt index 30b4763118a7..4c9e1740b3b5 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/screenrecord/data/repository/FakeScreenRecordRepository.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/screenrecord/data/repository/FakeScreenRecordRepository.kt @@ -16,6 +16,7 @@ package com.android.systemui.screenrecord.data.repository +import android.media.projection.StopReason import com.android.systemui.screenrecord.data.model.ScreenRecordModel import kotlinx.coroutines.flow.MutableStateFlow @@ -25,7 +26,7 @@ class FakeScreenRecordRepository : ScreenRecordRepository { var stopRecordingInvoked = false - override suspend fun stopRecording() { + override suspend fun stopRecording(@StopReason stopReason: Int) { stopRecordingInvoked = true } } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryKosmos.kt index dbaa0b1d5bf6..7488397dde1f 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/data/repository/ShadeDisplaysRepositoryKosmos.kt @@ -32,3 +32,6 @@ val Kosmos.shadeDisplaysRepository: MutableShadeDisplaysRepository by bgScope = testScope.backgroundScope, ) } + +val Kosmos.fakeShadeDisplaysRepository: FakeShadeDisplayRepository by + Kosmos.Fixture { FakeShadeDisplayRepository() } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorKosmos.kt new file mode 100644 index 000000000000..db4df38e038a --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/domain/interactor/ShadeDisplaysInteractorKosmos.kt @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.shade.domain.interactor + +import android.content.mockedContext +import android.view.mockWindowManager +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.testScope +import com.android.systemui.scene.ui.view.mockShadeRootView +import com.android.systemui.shade.ShadeWindowLayoutParams +import com.android.systemui.shade.data.repository.fakeShadeDisplaysRepository +import java.util.Optional + +val Kosmos.shadeLayoutParams by Kosmos.Fixture { + ShadeWindowLayoutParams.create(mockedContext) +} +val Kosmos.shadeDisplaysInteractor by + Kosmos.Fixture { + ShadeDisplaysInteractor( + Optional.of(mockShadeRootView), + fakeShadeDisplaysRepository, + mockedContext, + shadeLayoutParams, + mockWindowManager, + testScope.backgroundScope, + testScope.backgroundScope.coroutineContext, + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractorKosmos.kt index fcd14d8512fb..d8d4d2b65eff 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/chips/call/domain/interactor/CallChipInteractorKosmos.kt @@ -20,12 +20,14 @@ import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.applicationCoroutineScope import com.android.systemui.statusbar.chips.statusBarChipsLogger import com.android.systemui.statusbar.phone.ongoingcall.data.repository.ongoingCallRepository +import com.android.systemui.statusbar.phone.ongoingcall.domain.interactor.ongoingCallInteractor val Kosmos.callChipInteractor: CallChipInteractor by Kosmos.Fixture { CallChipInteractor( scope = applicationCoroutineScope, repository = ongoingCallRepository, + ongoingCallInteractor = ongoingCallInteractor, logger = statusBarChipsLogger, ) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/data/model/ActiveNotificationModelBuilder.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/data/model/ActiveNotificationModelBuilder.kt index 2ec801620212..c6ae15df6859 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/data/model/ActiveNotificationModelBuilder.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/data/model/ActiveNotificationModelBuilder.kt @@ -29,7 +29,6 @@ fun activeNotificationModel( key: String, groupKey: String? = null, whenTime: Long = 0L, - isPromoted: Boolean = false, isAmbient: Boolean = false, isRowDismissed: Boolean = false, isSilent: Boolean = false, @@ -53,7 +52,6 @@ fun activeNotificationModel( key = key, groupKey = groupKey, whenTime = whenTime, - isPromoted = isPromoted, isAmbient = isAmbient, isRowDismissed = isRowDismissed, isSilent = isSilent, diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractorKosmos.kt index 067193fb7aa9..f7acae9846df 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractorKosmos.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractorKosmos.kt @@ -19,13 +19,8 @@ package com.android.systemui.statusbar.notification.domain.interactor import com.android.systemui.kosmos.Kosmos import com.android.systemui.statusbar.notification.collection.provider.sectionStyleProvider import com.android.systemui.statusbar.notification.data.repository.activeNotificationListRepository -import com.android.systemui.statusbar.notification.promoted.promotedNotificationsProvider val Kosmos.renderNotificationListInteractor by Kosmos.Fixture { - RenderNotificationListInteractor( - activeNotificationListRepository, - sectionStyleProvider, - promotedNotificationsProvider, - ) + RenderNotificationListInteractor(activeNotificationListRepository, sectionStyleProvider) } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowBuilder.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowBuilder.kt index 2d3f68faf4b7..7126933154df 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowBuilder.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowBuilder.kt @@ -34,7 +34,7 @@ import com.android.systemui.TestableDependency import com.android.systemui.classifier.FalsingManagerFake import com.android.systemui.dump.DumpManager import com.android.systemui.flags.FakeFeatureFlagsClassic -import com.android.systemui.flags.FeatureFlags +import com.android.systemui.flags.FeatureFlagsClassic import com.android.systemui.flags.Flags import com.android.systemui.log.logcatLogBuffer import com.android.systemui.media.controls.util.MediaFeatureFlag @@ -92,8 +92,6 @@ import com.android.systemui.util.DeviceConfigProxyFake import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock -import com.android.systemui.wmshell.BubblesManager -import java.util.Optional import java.util.concurrent.CountDownLatch import java.util.concurrent.Executor import java.util.concurrent.TimeUnit @@ -106,7 +104,7 @@ import org.mockito.Mockito class ExpandableNotificationRowBuilder( private val context: Context, dependency: TestableDependency, - private val featureFlags: FakeFeatureFlagsClassic = FakeFeatureFlagsClassic(), + featureFlags: FakeFeatureFlagsClassic = FakeFeatureFlagsClassic(), ) { private val mMockLogger: ExpandableNotificationRowLogger @@ -137,7 +135,7 @@ class ExpandableNotificationRowBuilder( featureFlags.setDefault(Flags.ENABLE_NOTIFICATIONS_SIMULATE_SLOW_MEASURE) featureFlags.setDefault(Flags.BIGPICTURE_NOTIFICATION_LAZY_LOADING) - dependency.injectTestDependency(FeatureFlags::class.java, featureFlags) + dependency.injectTestDependency(FeatureFlagsClassic::class.java, featureFlags) dependency.injectMockDependency(NotificationMediaManager::class.java) dependency.injectMockDependency(NotificationShadeWindowController::class.java) dependency.injectMockDependency(MediaOutputDialogManager::class.java) @@ -299,7 +297,7 @@ class ExpandableNotificationRowBuilder( } private fun getNotifRemoteViewsFactoryContainer( - featureFlags: FeatureFlags + featureFlags: FeatureFlagsClassic ): NotifRemoteViewsFactoryContainer { return NotifRemoteViewsFactoryContainerImpl( featureFlags, @@ -380,7 +378,6 @@ class ExpandableNotificationRowBuilder( mStatusBarStateController, mPeopleNotificationIdentifier, mOnUserInteractionCallback, - Optional.of(Mockito.mock(BubblesManager::class.java, STUB_ONLY)), Mockito.mock(NotificationGutsManager::class.java, STUB_ONLY), mDismissibilityProvider, Mockito.mock(MetricsLogger::class.java, STUB_ONLY), @@ -388,11 +385,10 @@ class ExpandableNotificationRowBuilder( Mockito.mock(ColorUpdateLogger::class.java, STUB_ONLY), mSmartReplyConstants, mSmartReplyController, - featureFlags, Mockito.mock(IStatusBarService::class.java, STUB_ONLY), Mockito.mock(UiEventLogger::class.java, STUB_ONLY), ) - row.setAboveShelfChangedListener { aboveShelf: Boolean -> } + row.setAboveShelfChangedListener {} mBindStage.getStageParams(entry).requireContentViews(extraInflationFlags) inflateAndWait(entry) return row @@ -410,7 +406,7 @@ class ExpandableNotificationRowBuilder( private const val PKG = "com.android.systemui" private const val UID = 1000 private val USER_HANDLE = UserHandle.of(ActivityManager.getCurrentUser()) - private val INFLATION_FLAGS = + private const val INFLATION_FLAGS = FLAG_CONTENT_VIEW_CONTRACTED or FLAG_CONTENT_VIEW_EXPANDED or FLAG_CONTENT_VIEW_HEADS_UP private const val IS_CONVERSATION_FLAG = "test.isConversation" diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractorKosmos.kt new file mode 100644 index 000000000000..51fb36fb2ead --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/phone/ongoingcall/domain/interactor/OngoingCallInteractorKosmos.kt @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.statusbar.phone.ongoingcall.domain.interactor + +import com.android.systemui.activity.data.repository.activityManagerRepository +import com.android.systemui.kosmos.Kosmos +import com.android.systemui.kosmos.applicationCoroutineScope +import com.android.systemui.log.logcatLogBuffer +import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor + +val Kosmos.ongoingCallInteractor: OngoingCallInteractor by + Kosmos.Fixture { + OngoingCallInteractor( + scope = applicationCoroutineScope, + activeNotificationsInteractor = activeNotificationsInteractor, + activityManagerRepository = activityManagerRepository, + logBuffer = logcatLogBuffer("OngoingCallInteractorKosmos"), + ) + } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeCastController.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeCastController.kt index 2df0c7a5386e..da6b2ae46d2d 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeCastController.kt +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/policy/FakeCastController.kt @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.policy +import android.media.projection.StopReason import java.io.PrintWriter class FakeCastController : CastController { @@ -45,7 +46,7 @@ class FakeCastController : CastController { override fun startCasting(device: CastDevice?) {} - override fun stopCasting(device: CastDevice?) { + override fun stopCasting(device: CastDevice?, @StopReason stopReason: Int) { lastStoppedDevice = device } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/LeakCheckerCastController.java b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/LeakCheckerCastController.java index 2249bc0b667f..857dc8584be9 100644 --- a/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/LeakCheckerCastController.java +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/utils/leaks/LeakCheckerCastController.java @@ -16,6 +16,7 @@ package com.android.systemui.utils.leaks; +import android.media.projection.StopReason; import android.testing.LeakCheck; import com.android.systemui.statusbar.policy.CastController; @@ -51,7 +52,7 @@ public class LeakCheckerCastController extends BaseLeakChecker<Callback> impleme } @Override - public void stopCasting(CastDevice device) { + public void stopCasting(CastDevice device, @StopReason int stopReason) { } diff --git a/packages/SystemUI/tests/utils/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractorKosmos.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractorKosmos.kt new file mode 100644 index 000000000000..ddd001400879 --- /dev/null +++ b/packages/SystemUI/tests/utils/src/com/android/systemui/volume/dialog/domain/interactor/VolumeDialogSafetyWarningInteractorKosmos.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.volume.dialog.domain.interactor + +import com.android.systemui.kosmos.Kosmos + +val Kosmos.volumeDialogSafetyWarningInteractor: VolumeDialogSafetyWarningInteractor by + Kosmos.Fixture { + VolumeDialogSafetyWarningInteractor( + volumeDialogStateInteractor, + volumeDialogVisibilityInteractor, + ) + } diff --git a/packages/Vcn/service-b/Android.bp b/packages/Vcn/service-b/Android.bp index 26d83974949a..c1a1ee7875d0 100644 --- a/packages/Vcn/service-b/Android.bp +++ b/packages/Vcn/service-b/Android.bp @@ -77,6 +77,7 @@ java_library { "framework-connectivity-t-pre-jarjar", "framework-connectivity-b-pre-jarjar", "framework-wifi.stubs.module_lib", + "keepanno-annotations", "modules-utils-statemachine", "unsupportedappusage", ], diff --git a/packages/Vcn/service-b/src/com/android/server/ConnectivityServiceInitializerB.java b/packages/Vcn/service-b/src/com/android/server/ConnectivityServiceInitializerB.java new file mode 100644 index 000000000000..02c8ce4f29e9 --- /dev/null +++ b/packages/Vcn/service-b/src/com/android/server/ConnectivityServiceInitializerB.java @@ -0,0 +1,60 @@ +/* + * Copyright (C) 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server; + +import android.content.Context; +import android.util.Log; + +import com.android.tools.r8.keepanno.annotations.KeepItemKind; +import com.android.tools.r8.keepanno.annotations.UsedByReflection; + +/** + * Service initializer for VCN. This is called by system server to create a new instance of + * VcnManagementService. + */ +// This class is reflectively invoked from SystemServer and ConnectivityServiceInitializer. +// Without this annotation, this class will be treated as unused class and be removed during build +// time. +@UsedByReflection(kind = KeepItemKind.CLASS_AND_METHODS) +public final class ConnectivityServiceInitializerB extends SystemService { + private static final String TAG = ConnectivityServiceInitializerB.class.getSimpleName(); + private final VcnManagementService mVcnManagementService; + + public ConnectivityServiceInitializerB(Context context) { + super(context); + mVcnManagementService = VcnManagementService.create(context); + } + + @Override + public void onStart() { + if (mVcnManagementService != null) { + Log.i(TAG, "Registering " + Context.VCN_MANAGEMENT_SERVICE); + publishBinderService( + Context.VCN_MANAGEMENT_SERVICE, + mVcnManagementService, + /* allowIsolated= */ false); + } + } + + @Override + public void onBootPhase(int phase) { + if (mVcnManagementService != null && phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) { + Log.i(TAG, "Starting " + Context.VCN_MANAGEMENT_SERVICE); + mVcnManagementService.systemReady(); + } + } +} diff --git a/packages/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java b/packages/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java index f024b5f05bf6..e50fc3a6e8b9 100644 --- a/packages/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java +++ b/packages/Vcn/service-b/src/com/android/server/vcn/VcnGatewayConnection.java @@ -1228,10 +1228,7 @@ public class VcnGatewayConnection extends StateMachine { @VisibleForTesting(visibility = Visibility.PRIVATE) void setSafeModeAlarm() { - final boolean isFlagSafeModeConfigEnabled = mVcnContext.getFeatureFlags().safeModeConfig(); - logVdbg("isFlagSafeModeConfigEnabled " + isFlagSafeModeConfigEnabled); - - if (isFlagSafeModeConfigEnabled && !mConnectionConfig.isSafeModeEnabled()) { + if (!mConnectionConfig.isSafeModeEnabled()) { logVdbg("setSafeModeAlarm: safe mode disabled"); return; } diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp index 66c8d0fa32f9..59043a8356ae 100644 --- a/ravenwood/Android.bp +++ b/ravenwood/Android.bp @@ -182,21 +182,6 @@ java_device_for_host { visibility: [":__subpackages__"], } -// Separated out from ravenwood-junit-impl since it needs to compile -// against `module_current` -java_library { - name: "ravenwood-junit-impl-flag", - srcs: [ - "junit-flag-src/**/*.java", - ], - sdk_version: "module_current", - libs: [ - "junit", - "flag-junit", - ], - visibility: ["//visibility:public"], -} - // Carefully compiles against only module_current to support tests that // want to verify they're unbundled. The "impl" library above is what // ships inside the Ravenwood environment to actually drive any API @@ -651,7 +636,6 @@ android_ravenwood_libgroup { "flag-junit", "ravenwood-framework", "ravenwood-junit-impl", - "ravenwood-junit-impl-flag", "mockito-ravenwood-prebuilt", "inline-mockito-ravenwood-prebuilt", diff --git a/ravenwood/junit-flag-src/android/platform/test/flag/junit/RavenwoodFlagsValueProvider.java b/ravenwood/junit-flag-src/android/platform/test/flag/junit/RavenwoodFlagsValueProvider.java deleted file mode 100644 index 9d6277473298..000000000000 --- a/ravenwood/junit-flag-src/android/platform/test/flag/junit/RavenwoodFlagsValueProvider.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2024 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.platform.test.flag.junit; - -import android.platform.test.flag.junit.CheckFlagsRule; -import android.platform.test.flag.junit.IFlagsValueProvider; - -/** - * Offer to create {@link CheckFlagsRule} instances that are useful on the Ravenwood deviceless - * testing environment. - * - * At the moment, default flag values are not available on Ravenwood, so the only options offered - * here are "all-on" and "all-off" options. Tests that want to exercise specific flag states should - * use {@link android.platform.test.flag.junit.SetFlagsRule}. - */ -public class RavenwoodFlagsValueProvider { - /** - * Create a {@link CheckFlagsRule} instance where flags are in an "all-on" state. - */ - public static CheckFlagsRule createAllOnCheckFlagsRule() { - return new CheckFlagsRule(new IFlagsValueProvider() { - @Override - public boolean getBoolean(String flag) { - return true; - } - }); - } - - /** - * Create a {@link CheckFlagsRule} instance where flags are in an "all-off" state. - */ - public static CheckFlagsRule createAllOffCheckFlagsRule() { - return new CheckFlagsRule(new IFlagsValueProvider() { - @Override - public boolean getBoolean(String flag) { - return false; - } - }); - } -} diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodAwareTestRunner.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodAwareTestRunner.java index 9644a52a749e..3ebef02284d6 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodAwareTestRunner.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodAwareTestRunner.java @@ -129,7 +129,7 @@ public final class RavenwoodAwareTestRunner extends RavenwoodAwareTestRunnerBase mTestClass = new TestClass(testClass); - Log.v(TAG, "RavenwoodAwareTestRunner starting for " + testClass.getCanonicalName()); + Log.v(TAG, "RavenwoodAwareTestRunner initializing for " + testClass.getCanonicalName()); // Hook point to allow more customization. runAnnotatedMethodsOnRavenwood(RavenwoodTestRunnerInitializing.class, null); @@ -146,7 +146,9 @@ public final class RavenwoodAwareTestRunner extends RavenwoodAwareTestRunnerBase private void runAnnotatedMethodsOnRavenwood(Class<? extends Annotation> annotationClass, Object instance) { - Log.v(TAG, "runAnnotatedMethodsOnRavenwood() " + annotationClass.getName()); + if (RAVENWOOD_VERBOSE_LOGGING) { + Log.v(TAG, "runAnnotatedMethodsOnRavenwood() " + annotationClass.getName()); + } for (var method : mTestClass.getAnnotatedMethods(annotationClass)) { ensureIsPublicVoidMethod(method.getMethod(), /* isStatic=*/ instance == null); @@ -169,12 +171,14 @@ public final class RavenwoodAwareTestRunner extends RavenwoodAwareTestRunnerBase RavenwoodTestStats.getInstance().attachToRunNotifier(notifier); if (mRealRunner instanceof ClassSkippingTestRunner) { - Log.i(TAG, "onClassSkipped: description=" + description); + Log.v(TAG, "onClassSkipped: description=" + description); mRealRunner.run(notifier); return; } - Log.v(TAG, "Starting " + mTestJavaClass.getCanonicalName()); + if (RAVENWOOD_VERBOSE_LOGGING) { + Log.v(TAG, "Running " + mTestJavaClass.getCanonicalName()); + } if (RAVENWOOD_VERBOSE_LOGGING) { dumpDescription(description); } diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java index a5d0bfd51a0f..70bc52bdaa12 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRunnerState.java @@ -15,6 +15,8 @@ */ package android.platform.test.ravenwood; +import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_VERBOSE_LOGGING; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -59,16 +61,22 @@ public final class RavenwoodRunnerState { private Description mMethodDescription; public void enterTestRunner() { - Log.i(TAG, "enterTestRunner: " + mRunner); + if (RAVENWOOD_VERBOSE_LOGGING) { + Log.v(TAG, "enterTestRunner: " + mRunner); + } RavenwoodRuntimeEnvironmentController.initForRunner(); } public void enterTestClass() { - Log.i(TAG, "enterTestClass: " + mRunner.mTestJavaClass.getName()); + if (RAVENWOOD_VERBOSE_LOGGING) { + Log.v(TAG, "enterTestClass: " + mRunner.mTestJavaClass.getName()); + } } public void exitTestClass() { - Log.i(TAG, "exitTestClass: " + mRunner.mTestJavaClass.getName()); + if (RAVENWOOD_VERBOSE_LOGGING) { + Log.v(TAG, "exitTestClass: " + mRunner.mTestJavaClass.getName()); + } assertTrue(RAVENWOOD_RULE_ERROR, sActiveProperties.isEmpty()); RavenwoodRuntimeEnvironmentController.exitTestClass(); } diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java index 930914f586eb..3cb6c5a6bd16 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java @@ -552,7 +552,7 @@ public class RavenwoodRuntimeEnvironmentController { } private static void dumpCommandLineArgs() { - Log.i(TAG, "JVM arguments:"); + Log.v(TAG, "JVM arguments:"); // Note, we use the wrapper in JUnit4, not the actual class ( // java.lang.management.ManagementFactory), because we can't see the later at the build @@ -561,7 +561,7 @@ public class RavenwoodRuntimeEnvironmentController { var args = ManagementFactory.getRuntimeMXBean().getInputArguments(); for (var arg : args) { - Log.i(TAG, " " + arg); + Log.v(TAG, " " + arg); } } } diff --git a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java index fac07910be11..70c161c1f19a 100644 --- a/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java +++ b/ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodSystemProperties.java @@ -84,7 +84,7 @@ public class RavenwoodSystemProperties { var ravenwoodProps = readProperties(path + RAVENWOOD_BUILD_PROP); var deviceProps = readProperties(path + DEVICE_BUILD_PROP); - Log.i(TAG, "Default system properties:"); + Log.v(TAG, "Default system properties:"); ravenwoodProps.forEach((key, origValue) -> { final String value; @@ -100,7 +100,7 @@ public class RavenwoodSystemProperties { } else { value = origValue; } - Log.i(TAG, key + "=" + value); + Log.v(TAG, key + "=" + value); sDefaultValues.put(key, value); }); diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodAwareTestRunnerBase.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodAwareTestRunnerBase.java index f3688d664142..359210582ba5 100644 --- a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodAwareTestRunnerBase.java +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodAwareTestRunnerBase.java @@ -15,6 +15,8 @@ */ package android.platform.test.ravenwood; +import static com.android.ravenwood.common.RavenwoodCommonUtils.RAVENWOOD_VERBOSE_LOGGING; + import android.platform.test.annotations.internal.InnerRunner; import android.util.Log; @@ -53,7 +55,9 @@ abstract class RavenwoodAwareTestRunnerBase extends Runner implements Filterable } try { - Log.i(TAG, "Initializing the inner runner: " + runnerClass); + if (RAVENWOOD_VERBOSE_LOGGING) { + Log.v(TAG, "Initializing the inner runner: " + runnerClass); + } try { return runnerClass.getConstructor(Class.class) .newInstance(testClass.getJavaClass()); diff --git a/ravenwood/runtime-jni/ravenwood_initializer.cpp b/ravenwood/runtime-jni/ravenwood_initializer.cpp index dbbc3453b2f1..391c5d56b212 100644 --- a/ravenwood/runtime-jni/ravenwood_initializer.cpp +++ b/ravenwood/runtime-jni/ravenwood_initializer.cpp @@ -140,7 +140,7 @@ static void check_system_property_access(const char* key, bool write) { if (gVM != nullptr && gRunnerState != nullptr) { JNIEnv* env; if (gVM->GetEnv((void**)&env, JNI_VERSION_1_4) >= 0) { - ALOGI("%s access to system property '%s'", write ? "Write" : "Read", key); + ALOGV("%s access to system property '%s'", write ? "Write" : "Read", key); env->CallStaticVoidMethod(gRunnerState, gCheckSystemPropertyAccess, env->NewStringUTF(key), write ? JNI_TRUE : JNI_FALSE); return; @@ -208,7 +208,7 @@ static const JNINativeMethod sMethods[] = { }; extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { - ALOGI("%s: JNI_OnLoad", __FILE__); + ALOGV("%s: JNI_OnLoad", __FILE__); maybeRedirectLog(); diff --git a/ravenwood/runtime-jni/ravenwood_runtime.cpp b/ravenwood/runtime-jni/ravenwood_runtime.cpp index bab4c7e0fd14..8d8ed7119e84 100644 --- a/ravenwood/runtime-jni/ravenwood_runtime.cpp +++ b/ravenwood/runtime-jni/ravenwood_runtime.cpp @@ -204,7 +204,7 @@ static const JNINativeMethod sMethods[] = }; extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) { - ALOGI("%s: JNI_OnLoad", __FILE__); + ALOGV("%s: JNI_OnLoad", __FILE__); JNIEnv* env = GetJNIEnvOrDie(vm); g_StructStat = FindGlobalClassOrDie(env, "android/system/StructStat"); diff --git a/services/Android.bp b/services/Android.bp index 225304fcf45e..fc0bb33e6e4e 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -294,10 +294,6 @@ system_java_library { "service-permission.stubs.system_server", "service-rkp.stubs.system_server", "service-sdksandbox.stubs.system_server", - - // TODO: b/30242953 This is for accessing IVcnManagementService and - // can be removed VCN is in mainline - "framework-connectivity-b-pre-jarjar", ], soong_config_variables: { diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index e50535fb5e53..5c1ad74fac93 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -1070,8 +1070,11 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub newValue, restoredFromSdk); } } + // Currently in SUW, the user can't see gesture shortcut option as the + // navigation system is set to button navigation. We'll rely on the + // SettingsBackupAgent to restore the settings since we don't + // need to merge an empty gesture target. case Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS, - Settings.Secure.ACCESSIBILITY_GESTURE_TARGETS, Settings.Secure.ACCESSIBILITY_QS_TARGETS, Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE -> restoreShortcutTargets(newValue, @@ -2256,10 +2259,6 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub if (shortcutType == QUICK_SETTINGS && !android.view.accessibility.Flags.a11yQsShortcut()) { return; } - if (shortcutType == HARDWARE - && !android.view.accessibility.Flags.restoreA11yShortcutTargetService()) { - return; - } synchronized (mLock) { final AccessibilityUserState userState = getUserStateLocked(UserHandle.USER_SYSTEM); @@ -2928,27 +2927,25 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub final String builderValue = builder.toString(); final String settingValue = TextUtils.isEmpty(builderValue) ? defaultEmptyString : builderValue; - if (android.view.accessibility.Flags.restoreA11yShortcutTargetService()) { - final String currentValue = Settings.Secure.getStringForUser( - mContext.getContentResolver(), settingName, userId); - if (Objects.equals(settingValue, currentValue)) { - // This logic exists to fix a bug where AccessibilityManagerService was writing - // `null` to the ACCESSIBILITY_SHORTCUT_TARGET_SERVICE setting during early boot - // during setup, due to a race condition in package scanning making A11yMS think - // that the default service was not installed. - // - // Writing `null` was implicitly causing that Setting to have the default - // `DEFAULT_OVERRIDEABLE_BY_RESTORE` property, which was preventing B&R for that - // Setting altogether. - // - // The "quick fix" here is to not write `null` if the existing value is already - // `null`. The ideal fix would be use the Settings.Secure#putStringForUser overload - // that allows override-by-restore, but the full repercussions of using that here - // have not yet been evaluated. - // TODO: b/333457719 - Evaluate and fix AccessibilityManagerService's usage of - // "overridable by restore" when writing secure settings. - return; - } + final String currentValue = Settings.Secure.getStringForUser( + mContext.getContentResolver(), settingName, userId); + if (Objects.equals(settingValue, currentValue)) { + // This logic exists to fix a bug where AccessibilityManagerService was writing + // `null` to the ACCESSIBILITY_SHORTCUT_TARGET_SERVICE setting during early boot + // during setup, due to a race condition in package scanning making A11yMS think + // that the default service was not installed. + // + // Writing `null` was implicitly causing that Setting to have the default + // `DEFAULT_OVERRIDEABLE_BY_RESTORE` property, which was preventing B&R for that + // Setting altogether. + // + // The "quick fix" here is to not write `null` if the existing value is already + // `null`. The ideal fix would be use the Settings.Secure#putStringForUser overload + // that allows override-by-restore, but the full repercussions of using that here + // have not yet been evaluated. + // TODO: b/333457719 - Evaluate and fix AccessibilityManagerService's usage of + // "overridable by restore" when writing secure settings. + return; } final long identity = Binder.clearCallingIdentity(); try { diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index 8b870dbaa100..b7fd09f7b594 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -832,20 +832,12 @@ public class AccessibilityWindowManager { != AccessibilityWindowInfo.UNDEFINED_WINDOW_ID; } - boolean hasWindowIgnore = false; if (windowCount > 0) { - for (int i = 0; i < windowCount; i++) { - final WindowInfo windowInfo = windows.get(i); - final AccessibilityWindowInfo window; - if (mTrackingWindows) { - window = populateReportedWindowLocked(userId, windowInfo, oldWindowsById); - if (window == null) { - hasWindowIgnore = true; - } - } else { - window = null; - } - if (window != null) { + if (mTrackingWindows) { + for (int i = 0; i < windowCount; i++) { + final WindowInfo windowInfo = windows.get(i); + final AccessibilityWindowInfo window = + populateReportedWindowLocked(userId, windowInfo, oldWindowsById); // Flip layers in list to be consistent with AccessibilityService#getWindows window.setLayer(windowCount - 1 - window.getLayer()); @@ -870,13 +862,6 @@ public class AccessibilityWindowManager { } } final int accessibilityWindowCount = mWindows.size(); - // Re-order the window layer of all windows in the windows list because there's - // window not been added into the windows list. - if (hasWindowIgnore) { - for (int i = 0; i < accessibilityWindowCount; i++) { - mWindows.get(i).setLayer(accessibilityWindowCount - 1 - i); - } - } if (isTopFocusedDisplay) { if (mTouchInteractionInProgress && activeWindowGone) { mActiveWindowId = mTopFocusedWindowId; diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 762665c00e05..cffdfbd36532 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -330,6 +330,8 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku // Handler to the background thread that saves states to disk. private Handler mSaveStateHandler; + + private Handler mAlarmHandler; // Handler to the background thread that saves generated previews to disk. All operations that // modify saved previews must be run on this Handler. private Handler mSavePreviewsHandler; @@ -373,6 +375,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku if (removeAppWidgetServiceIoFromCriticalPath()) { mSaveStateHandler = new Handler(BackgroundThread.get().getLooper(), this::handleSaveMessage); + mAlarmHandler = new Handler(BackgroundThread.get().getLooper()); } else { mSaveStateHandler = BackgroundThread.getHandler(); } @@ -2739,10 +2742,15 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku } if (provider.broadcast != null) { final PendingIntent broadcast = provider.broadcast; - mSaveStateHandler.post(() -> { - mAlarmManager.cancel(broadcast); - broadcast.cancel(); - }); + Runnable cancelRunnable = () -> { + mAlarmManager.cancel(broadcast); + broadcast.cancel(); + }; + if (removeAppWidgetServiceIoFromCriticalPath()) { + mAlarmHandler.post(cancelRunnable); + } else { + mSaveStateHandler.post(cancelRunnable); + } provider.broadcast = null; } } @@ -3422,10 +3430,16 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku // invariant and established the PendingIntent safely. final long period = Math.max(info.updatePeriodMillis, MIN_UPDATE_PERIOD); final PendingIntent broadcast = provider.broadcast; - mSaveStateHandler.post(() -> + + Runnable repeatRunnable = () -> { mAlarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME_WAKEUP, - SystemClock.elapsedRealtime() + period, period, broadcast) - ); + SystemClock.elapsedRealtime() + period, period, broadcast); + }; + if (removeAppWidgetServiceIoFromCriticalPath()) { + mAlarmHandler.post(repeatRunnable); + } else { + mSaveStateHandler.post(repeatRunnable); + } } } } diff --git a/services/autofill/features.aconfig b/services/autofill/features.aconfig index 80e0e5dc6e1a..b78d103f287c 100644 --- a/services/autofill/features.aconfig +++ b/services/autofill/features.aconfig @@ -2,6 +2,13 @@ package: "android.service.autofill" container: "system" flag { + name: "autofill_session_destroyed" + namespace: "autofill" + description: "Guards against new metrics definitions introduced in W" + bug: "342676602" +} + +flag { name: "autofill_w_metrics" namespace: "autofill" description: "Guards against new metrics definitions introduced in W" diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index cd4ace2e3835..5cf96bfb2b8b 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -61,6 +61,7 @@ import android.service.autofill.FillEventHistory; import android.service.autofill.FillEventHistory.Event; import android.service.autofill.FillEventHistory.Event.NoSaveReason; import android.service.autofill.FillResponse; +import android.service.autofill.Flags; import android.service.autofill.IAutoFillService; import android.service.autofill.InlineSuggestionRenderService; import android.service.autofill.SaveInfo; @@ -100,6 +101,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Random; + /** * Bridge between the {@code system_server}'s {@link AutofillManagerService} and the * app's {@link IAutoFillService} implementation. @@ -748,6 +750,22 @@ final class AutofillManagerServiceImpl @GuardedBy("mLock") void removeSessionLocked(int sessionId) { mSessions.remove(sessionId); + if (Flags.autofillSessionDestroyed()) { + if (sVerbose) { + Slog.v( + TAG, + "removeSessionLocked(): removed " + sessionId); + } + RemoteFillService remoteService = + new RemoteFillService( + getContext(), + mInfo.getServiceInfo().getComponentName(), + mUserId, + /* callbacks= */ null, + mMaster.isInstantServiceAllowed(), + /* credentialAutofillService= */ null); + remoteService.onSessionDestroyed(null); + } } /** diff --git a/services/autofill/java/com/android/server/autofill/RemoteFillService.java b/services/autofill/java/com/android/server/autofill/RemoteFillService.java index 07f5dcc3cb0a..f1e888400d32 100644 --- a/services/autofill/java/com/android/server/autofill/RemoteFillService.java +++ b/services/autofill/java/com/android/server/autofill/RemoteFillService.java @@ -34,6 +34,7 @@ import android.os.RemoteException; import android.service.autofill.AutofillService; import android.service.autofill.ConvertCredentialRequest; import android.service.autofill.ConvertCredentialResponse; +import android.service.autofill.FillEventHistory; import android.service.autofill.FillRequest; import android.service.autofill.FillResponse; import android.service.autofill.IAutoFillService; @@ -497,6 +498,14 @@ final class RemoteFillService extends ServiceConnector.Impl<IAutoFillService> { })); } + public void onSessionDestroyed(@Nullable FillEventHistory history) { + boolean success = run(service -> { + service.onSessionDestroyed(history); + }); + + if (sVerbose) Slog.v(TAG, "called onSessionDestroyed(): " + success); + } + void onSavedPasswordCountRequest(IResultReceiver receiver) { run(service -> service.onSavedPasswordCountRequest(receiver)); } diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java index a90b693c5a1d..3025e2eaede0 100644 --- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java @@ -314,8 +314,6 @@ public class UserBackupManagerService { private static final String SERIAL_ID_FILE = "serial_id"; - private static final String SKIP_USER_FACING_PACKAGES = "backup_skip_user_facing_packages"; - private final @UserIdInt int mUserId; private final BackupAgentTimeoutParameters mAgentTimeoutParameters; private final TransportManager mTransportManager; @@ -3503,40 +3501,6 @@ public class UserBackupManagerService { } } - /** - * We want to skip backup/restore of certain packages if 'backup_skip_user_facing_packages' is - * set to true in secure settings. See b/153940088 for details. - * - * TODO(b/154822946): Remove this logic in the next release. - */ - public List<PackageInfo> filterUserFacingPackages(List<PackageInfo> packages) { - if (!shouldSkipUserFacingData()) { - return packages; - } - - List<PackageInfo> filteredPackages = new ArrayList<>(packages.size()); - for (PackageInfo packageInfo : packages) { - if (!shouldSkipPackage(packageInfo.packageName)) { - filteredPackages.add(packageInfo); - } else { - Slog.i(TAG, "Will skip backup/restore for " + packageInfo.packageName); - } - } - - return filteredPackages; - } - - @VisibleForTesting - public boolean shouldSkipUserFacingData() { - return Settings.Secure.getInt(mContext.getContentResolver(), SKIP_USER_FACING_PACKAGES, - /* def */ 0) != 0; - } - - @VisibleForTesting - public boolean shouldSkipPackage(String packageName) { - return WALLPAPER_PACKAGE.equals(packageName); - } - private void updateStateForTransport(String newTransportName) { // Publish the name change Settings.Secure.putStringForUser(mContext.getContentResolver(), diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java index 799494831f19..990c9416e38d 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -272,8 +272,6 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba } } - mPackages = backupManagerService.filterUserFacingPackages(mPackages); - Set<String> packageNames = Sets.newHashSet(); for (PackageInfo pkgInfo : mPackages) { packageNames.add(pkgInfo.packageName); diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index dad84c86deef..ec9d340abe45 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -315,8 +315,6 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { } } - mAcceptSet = backupManagerService.filterUserFacingPackages(mAcceptSet); - if (MORE_DEBUG) { Slog.v(TAG, "Restore; accept set size is " + mAcceptSet.size()); for (PackageInfo info : mAcceptSet) { diff --git a/services/core/Android.bp b/services/core/Android.bp index 08206150cebb..ffa259b536ec 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -221,6 +221,7 @@ java_library_static { "securebox", "apache-commons-math", "battery_saver_flag_lib", + "guava", "notification_flags_lib", "power_hint_flags_lib", "biometrics_flags_lib", diff --git a/services/core/java/android/content/pm/PackageManagerInternal.java b/services/core/java/android/content/pm/PackageManagerInternal.java index 43774bbc51ca..b0dae6a1f306 100644 --- a/services/core/java/android/content/pm/PackageManagerInternal.java +++ b/services/core/java/android/content/pm/PackageManagerInternal.java @@ -90,6 +90,7 @@ public abstract class PackageManagerInternal { */ public static final int RESOLVE_NON_RESOLVER_ONLY = 0x00000002; + @Deprecated @IntDef(value = { INTEGRITY_VERIFICATION_ALLOW, INTEGRITY_VERIFICATION_REJECT, @@ -97,18 +98,10 @@ public abstract class PackageManagerInternal { @Retention(RetentionPolicy.SOURCE) public @interface IntegrityVerificationResult {} - /** - * Used as the {@code verificationCode} argument for - * {@link PackageManagerInternal#setIntegrityVerificationResult(int, int)} to indicate that the - * integrity component allows the install to proceed. - */ + @Deprecated public static final int INTEGRITY_VERIFICATION_ALLOW = 1; - /** - * Used as the {@code verificationCode} argument for - * {@link PackageManagerInternal#setIntegrityVerificationResult(int, int)} to indicate that the - * integrity component does not allow install to proceed. - */ + @Deprecated public static final int INTEGRITY_VERIFICATION_REJECT = 0; /** @@ -1131,17 +1124,13 @@ public abstract class PackageManagerInternal { public abstract boolean isPermissionUpgradeNeeded(@UserIdInt int userId); /** - * Allows the integrity component to respond to the - * {@link Intent#ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION package verification - * broadcast} to respond to the package manager. The response must include - * the {@code verificationCode} which is one of - * {@link #INTEGRITY_VERIFICATION_ALLOW} and {@link #INTEGRITY_VERIFICATION_REJECT}. + * Used to allow the integrity component to respond to the + * ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION package verification + * broadcast to respond to the package manager. * - * @param verificationId pending package identifier as passed via the - * {@link PackageManager#EXTRA_VERIFICATION_ID} Intent extra. - * @param verificationResult either {@link #INTEGRITY_VERIFICATION_ALLOW} - * or {@link #INTEGRITY_VERIFICATION_REJECT}. + * Deprecated. */ + @Deprecated public abstract void setIntegrityVerificationResult(int verificationId, @IntegrityVerificationResult int verificationResult); diff --git a/services/core/java/com/android/server/DockObserver.java b/services/core/java/com/android/server/DockObserver.java index fb527c104946..2412b01ea8e2 100644 --- a/services/core/java/com/android/server/DockObserver.java +++ b/services/core/java/com/android/server/DockObserver.java @@ -19,6 +19,7 @@ package com.android.server; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; import android.database.ContentObserver; import android.media.AudioManager; import android.media.Ringtone; @@ -35,6 +36,7 @@ import android.provider.Settings; import android.util.Pair; import android.util.Slog; +import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.DumpUtils; import com.android.internal.util.FrameworkStatsLog; @@ -259,11 +261,19 @@ final class DockObserver extends SystemService { + mReportedDockState); final int previousDockState = mPreviousDockState; mPreviousDockState = mReportedDockState; - // Skip the dock intent if not yet provisioned. + final ContentResolver cr = getContext().getContentResolver(); - if (!mDeviceProvisionedObserver.isDeviceProvisioned()) { - Slog.i(TAG, "Device not provisioned, skipping dock broadcast"); - return; + + /// If the allow dock rotation before provision is enabled then we allow rotation. + final Resources r = getContext().getResources(); + final boolean allowDockBeforeProvision = + r.getBoolean(R.bool.config_allowDockBeforeProvision); + if (!allowDockBeforeProvision) { + // Skip the dock intent if not yet provisioned. + if (!mDeviceProvisionedObserver.isDeviceProvisioned()) { + Slog.i(TAG, "Device not provisioned, skipping dock broadcast"); + return; + } } // Pack up the values and broadcast them to everyone diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index d13dd2f2e1fc..896c9b8d0932 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -885,8 +885,6 @@ final class UiModeManagerService extends SystemService { ? customModeType : MODE_NIGHT_CUSTOM_TYPE_UNKNOWN; mNightMode.set(mode); - //deactivates AttentionMode if user toggles DarkTheme - mAttentionModeThemeOverlay = MODE_ATTENTION_THEME_OVERLAY_OFF; resetNightModeOverrideLocked(); persistNightMode(user); // on screen off will update configuration instead @@ -1009,15 +1007,16 @@ final class UiModeManagerService extends SystemService { @Override public boolean setNightModeActivatedForCustomMode(int modeNightCustomType, boolean active) { - return setNightModeActivatedForModeInternal(modeNightCustomType, active); + return setNightModeActivatedForModeInternal(modeNightCustomType, active, false); } @Override public boolean setNightModeActivated(boolean active) { - return setNightModeActivatedForModeInternal(mNightModeCustomType, active); + return setNightModeActivatedForModeInternal(mNightModeCustomType, active, true); } - private boolean setNightModeActivatedForModeInternal(int modeCustomType, boolean active) { + private boolean setNightModeActivatedForModeInternal(int modeCustomType, + boolean active, boolean isUserInteraction) { if (getContext().checkCallingOrSelfPermission( android.Manifest.permission.MODIFY_DAY_NIGHT_MODE) != PackageManager.PERMISSION_GRANTED) { @@ -1053,13 +1052,16 @@ final class UiModeManagerService extends SystemService { mOverrideNightModeOn = active; mOverrideNightModeUser = mCurrentUser; persistNightModeOverrides(mCurrentUser); - } else if (mNightMode.get() == UiModeManager.MODE_NIGHT_NO - && active) { + } else if (mNightMode.get() == UiModeManager.MODE_NIGHT_NO && active) { mNightMode.set(UiModeManager.MODE_NIGHT_YES); - } else if (mNightMode.get() == UiModeManager.MODE_NIGHT_YES - && !active) { + } else if (mNightMode.get() == UiModeManager.MODE_NIGHT_YES && !active) { mNightMode.set(UiModeManager.MODE_NIGHT_NO); } + + if (isUserInteraction) { + // deactivates AttentionMode if user toggles DarkTheme + mAttentionModeThemeOverlay = MODE_ATTENTION_THEME_OVERLAY_OFF; + } updateConfigurationLocked(); applyConfigurationExternallyLocked(); persistNightMode(mCurrentUser); diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index a58d850e042f..60516c39ffa7 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -4604,7 +4604,7 @@ public final class ActiveServices { return true; } - void unbindFinishedLocked(ServiceRecord r, Intent intent, boolean doRebind) { + void unbindFinishedLocked(ServiceRecord r, Intent intent) { final long origId = mAm.mInjector.clearCallingIdentity(); try { if (r != null) { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 37d0c7de7629..ebe7fa5e5a3f 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -13977,14 +13977,14 @@ public class ActivityManagerService extends IActivityManager.Stub } } - public void unbindFinished(IBinder token, Intent intent, boolean doRebind) { + public void unbindFinished(IBinder token, Intent intent) { // Refuse possible leaked file descriptors if (intent != null && intent.hasFileDescriptors() == true) { throw new IllegalArgumentException("File descriptors passed in Intent"); } synchronized(this) { - mServices.unbindFinishedLocked((ServiceRecord)token, intent, doRebind); + mServices.unbindFinishedLocked((ServiceRecord)token, intent); } } @@ -19334,7 +19334,8 @@ public class ActivityManagerService extends IActivityManager.Stub if (!preventIntentRedirect()) return; if (intent == null) return; - if ((intent.getExtendedFlags() & Intent.EXTENDED_FLAG_NESTED_INTENT_KEYS_COLLECTED) == 0) { + if (((intent.getExtendedFlags() & Intent.EXTENDED_FLAG_NESTED_INTENT_KEYS_COLLECTED) == 0) + && intent.getExtras() != null && intent.getExtras().hasIntent()) { Slog.wtf(TAG, "[IntentRedirect] The intent does not have its nested keys collected as a " + "preparation for creating intent creator tokens. Intent: " diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 400ebfde1741..c27126a01a32 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -1251,12 +1251,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub } private static float clampPowerMah(double powerMah, String consumer) { - float resultPowerMah = 0; - if (powerMah <= Float.MAX_VALUE && powerMah >= Float.MIN_VALUE) { - resultPowerMah = (float) powerMah; - } else { - // Handle overflow appropriately - Slog.wtfStack(TAG, consumer + " reported powerMah float overflow: " + powerMah); + float resultPowerMah = Double.valueOf(powerMah).floatValue(); + if (Float.isInfinite(resultPowerMah)) { + resultPowerMah = 0; + Slog.d(TAG, consumer + " reported powerMah float overflow : " + powerMah); } return resultPowerMah; } @@ -1361,11 +1359,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub final String powerComponentName = batteryConsumer.getPowerComponentName(componentId); final double consumedPowerMah = batteryConsumer.getConsumedPower(key); - float powerMah = + final float powerMah = clampPowerMah( - consumedPowerMah, "uidConsumer-" + uid + "-" + powerComponentName); + consumedPowerMah, "uid-" + uid + "-" + powerComponentName); final long powerComponentDurationMillis = batteryConsumer.getUsageDurationMillis(key); - if (powerMah == 0 && powerComponentDurationMillis == 0) { return true; } diff --git a/services/core/java/com/android/server/appop/AppOpsService.java b/services/core/java/com/android/server/appop/AppOpsService.java index 06c586f5e9c2..295e0443371d 100644 --- a/services/core/java/com/android/server/appop/AppOpsService.java +++ b/services/core/java/com/android/server/appop/AppOpsService.java @@ -3191,7 +3191,7 @@ public class AppOpsService extends IAppOpsService.Stub { resolveProxyPackageName, proxyAttributionTag, proxyVirtualDeviceId, Process.INVALID_UID, null, null, Context.DEVICE_ID_DEFAULT, proxyFlags, !isProxyTrusted, - "proxy " + message, shouldCollectMessage); + "proxy " + message, shouldCollectMessage, 1); if (proxyReturn.getOpMode() != AppOpsManager.MODE_ALLOWED) { return new SyncNotedAppOp(proxyReturn.getOpMode(), code, proxiedAttributionTag, proxiedPackageName); @@ -3210,7 +3210,20 @@ public class AppOpsService extends IAppOpsService.Stub { return noteOperationUnchecked(code, proxiedUid, resolveProxiedPackageName, proxiedAttributionTag, proxiedVirtualDeviceId, proxyUid, resolveProxyPackageName, proxyAttributionTag, proxyVirtualDeviceId, proxiedFlags, shouldCollectAsyncNotedOp, - message, shouldCollectMessage); + message, shouldCollectMessage, 1); + } + + @Override + public void noteOperationsInBatch(Map batchedNoteOps) { + for (var entry : ((Map<AppOpsManager.NotedOp, Integer>) batchedNoteOps).entrySet()) { + AppOpsManager.NotedOp notedOp = entry.getKey(); + int notedCount = entry.getValue(); + mCheckOpsDelegateDispatcher.noteOperation( + notedOp.getOp(), notedOp.getUid(), notedOp.getPackageName(), + notedOp.getAttributionTag(), notedOp.getVirtualDeviceId(), + notedOp.getShouldCollectAsyncNotedOp(), notedOp.getMessage(), + notedOp.getShouldCollectMessage(), notedCount); + } } @Override @@ -3228,7 +3241,7 @@ public class AppOpsService extends IAppOpsService.Stub { } return mCheckOpsDelegateDispatcher.noteOperation(code, uid, packageName, attributionTag, Context.DEVICE_ID_DEFAULT, shouldCollectAsyncNotedOp, message, - shouldCollectMessage); + shouldCollectMessage, 1); } @Override @@ -3237,13 +3250,12 @@ public class AppOpsService extends IAppOpsService.Stub { String message, boolean shouldCollectMessage) { return mCheckOpsDelegateDispatcher.noteOperation(code, uid, packageName, attributionTag, virtualDeviceId, shouldCollectAsyncNotedOp, message, - shouldCollectMessage); + shouldCollectMessage, 1); } private SyncNotedAppOp noteOperationImpl(int code, int uid, @Nullable String packageName, - @Nullable String attributionTag, int virtualDeviceId, - boolean shouldCollectAsyncNotedOp, @Nullable String message, - boolean shouldCollectMessage) { + @Nullable String attributionTag, int virtualDeviceId, boolean shouldCollectAsyncNotedOp, + @Nullable String message, boolean shouldCollectMessage, int notedCount) { String resolvedPackageName; if (!shouldUseNewCheckOp()) { verifyIncomingUid(uid); @@ -3278,14 +3290,14 @@ public class AppOpsService extends IAppOpsService.Stub { return noteOperationUnchecked(code, uid, resolvedPackageName, attributionTag, virtualDeviceId, Process.INVALID_UID, null, null, Context.DEVICE_ID_DEFAULT, AppOpsManager.OP_FLAG_SELF, shouldCollectAsyncNotedOp, - message, shouldCollectMessage); + message, shouldCollectMessage, notedCount); } private SyncNotedAppOp noteOperationUnchecked(int code, int uid, @NonNull String packageName, @Nullable String attributionTag, int virtualDeviceId, int proxyUid, String proxyPackageName, @Nullable String proxyAttributionTag, int proxyVirtualDeviceId, @OpFlags int flags, boolean shouldCollectAsyncNotedOp, @Nullable String message, - boolean shouldCollectMessage) { + boolean shouldCollectMessage, int notedCount) { PackageVerificationResult pvr; try { pvr = verifyAndGetBypass(uid, packageName, attributionTag, proxyPackageName); @@ -3388,11 +3400,11 @@ public class AppOpsService extends IAppOpsService.Stub { virtualDeviceId, flags, AppOpsManager.MODE_ALLOWED); attributedOp.accessed(proxyUid, proxyPackageName, proxyAttributionTag, - getPersistentId(proxyVirtualDeviceId), uidState.getState(), flags); + getPersistentId(proxyVirtualDeviceId), uidState.getState(), flags, notedCount); if (shouldCollectAsyncNotedOp) { collectAsyncNotedOp(uid, packageName, code, attributionTag, flags, message, - shouldCollectMessage); + shouldCollectMessage, notedCount); } return new SyncNotedAppOp(AppOpsManager.MODE_ALLOWED, code, attributionTag, @@ -3551,7 +3563,7 @@ public class AppOpsService extends IAppOpsService.Stub { */ private void collectAsyncNotedOp(int uid, @NonNull String packageName, int opCode, @Nullable String attributionTag, @OpFlags int flags, @NonNull String message, - boolean shouldCollectMessage) { + boolean shouldCollectMessage, int notedCount) { Objects.requireNonNull(message); int callingUid = Binder.getCallingUid(); @@ -3559,42 +3571,51 @@ public class AppOpsService extends IAppOpsService.Stub { final long token = Binder.clearCallingIdentity(); try { synchronized (this) { - Pair<String, Integer> key = getAsyncNotedOpsKey(packageName, uid); - - RemoteCallbackList<IAppOpsAsyncNotedCallback> callbacks = mAsyncOpWatchers.get(key); - AsyncNotedAppOp asyncNotedOp = new AsyncNotedAppOp(opCode, callingUid, - attributionTag, message, System.currentTimeMillis()); - final boolean[] wasNoteForwarded = {false}; - if ((flags & (OP_FLAG_SELF | OP_FLAG_TRUSTED_PROXIED)) != 0 && shouldCollectMessage) { reportRuntimeAppOpAccessMessageAsyncLocked(uid, packageName, opCode, attributionTag, message); } - if (callbacks != null) { + Pair<String, Integer> key = getAsyncNotedOpsKey(packageName, uid); + RemoteCallbackList<IAppOpsAsyncNotedCallback> callbacks = mAsyncOpWatchers.get(key); + if (callbacks == null) { + return; + } + + final boolean[] wasNoteForwarded = {false}; + if (Flags.rateLimitBatchedNoteOpAsyncCallbacksEnabled()) { + notedCount = 1; + } + + for (int i = 0; i < notedCount; i++) { + AsyncNotedAppOp asyncNotedOp = new AsyncNotedAppOp(opCode, callingUid, + attributionTag, message, System.currentTimeMillis()); + wasNoteForwarded[0] = false; callbacks.broadcast((cb) -> { try { cb.opNoted(asyncNotedOp); wasNoteForwarded[0] = true; } catch (RemoteException e) { Slog.e(TAG, - "Could not forward noteOp of " + opCode + " to " + packageName + "Could not forward noteOp of " + opCode + " to " + + packageName + "/" + uid + "(" + attributionTag + ")", e); } }); - } - if (!wasNoteForwarded[0]) { - ArrayList<AsyncNotedAppOp> unforwardedOps = mUnforwardedAsyncNotedOps.get(key); - if (unforwardedOps == null) { - unforwardedOps = new ArrayList<>(1); - mUnforwardedAsyncNotedOps.put(key, unforwardedOps); - } + if (!wasNoteForwarded[0]) { + ArrayList<AsyncNotedAppOp> unforwardedOps = mUnforwardedAsyncNotedOps.get( + key); + if (unforwardedOps == null) { + unforwardedOps = new ArrayList<>(1); + mUnforwardedAsyncNotedOps.put(key, unforwardedOps); + } - unforwardedOps.add(asyncNotedOp); - if (unforwardedOps.size() > MAX_UNFORWARDED_OPS) { - unforwardedOps.remove(0); + unforwardedOps.add(asyncNotedOp); + if (unforwardedOps.size() > MAX_UNFORWARDED_OPS) { + unforwardedOps.remove(0); + } } } } @@ -4026,7 +4047,7 @@ public class AppOpsService extends IAppOpsService.Stub { if (shouldCollectAsyncNotedOp && !isRestricted) { collectAsyncNotedOp(uid, packageName, code, attributionTag, AppOpsManager.OP_FLAG_SELF, - message, shouldCollectMessage); + message, shouldCollectMessage, 1); } return new SyncNotedAppOp(isRestricted ? MODE_IGNORED : MODE_ALLOWED, code, attributionTag, @@ -7574,34 +7595,36 @@ public class AppOpsService extends IAppOpsService.Stub { public SyncNotedAppOp noteOperation(int code, int uid, String packageName, String attributionTag, int virtualDeviceId, boolean shouldCollectAsyncNotedOp, - String message, boolean shouldCollectMessage) { + String message, boolean shouldCollectMessage, int notedCount) { if (mPolicy != null) { if (mCheckOpsDelegate != null) { return mPolicy.noteOperation(code, uid, packageName, attributionTag, virtualDeviceId, shouldCollectAsyncNotedOp, message, - shouldCollectMessage, this::noteDelegateOperationImpl + shouldCollectMessage, notedCount, this::noteDelegateOperationImpl ); } else { return mPolicy.noteOperation(code, uid, packageName, attributionTag, virtualDeviceId, shouldCollectAsyncNotedOp, message, - shouldCollectMessage, AppOpsService.this::noteOperationImpl + shouldCollectMessage, notedCount, AppOpsService.this::noteOperationImpl ); } } else if (mCheckOpsDelegate != null) { return noteDelegateOperationImpl(code, uid, packageName, attributionTag, - virtualDeviceId, shouldCollectAsyncNotedOp, message, shouldCollectMessage); + virtualDeviceId, shouldCollectAsyncNotedOp, message, shouldCollectMessage, + notedCount); } return noteOperationImpl(code, uid, packageName, attributionTag, - virtualDeviceId, shouldCollectAsyncNotedOp, message, shouldCollectMessage); + virtualDeviceId, shouldCollectAsyncNotedOp, message, shouldCollectMessage, + notedCount); } private SyncNotedAppOp noteDelegateOperationImpl(int code, int uid, @Nullable String packageName, @Nullable String featureId, int virtualDeviceId, boolean shouldCollectAsyncNotedOp, @Nullable String message, - boolean shouldCollectMessage) { + boolean shouldCollectMessage, int notedCount) { return mCheckOpsDelegate.noteOperation(code, uid, packageName, featureId, virtualDeviceId, shouldCollectAsyncNotedOp, message, shouldCollectMessage, - AppOpsService.this::noteOperationImpl + notedCount, AppOpsService.this::noteOperationImpl ); } diff --git a/services/core/java/com/android/server/appop/AttributedOp.java b/services/core/java/com/android/server/appop/AttributedOp.java index 314664b0a79d..4d114b4ad4ac 100644 --- a/services/core/java/com/android/server/appop/AttributedOp.java +++ b/services/core/java/com/android/server/appop/AttributedOp.java @@ -100,10 +100,12 @@ final class AttributedOp { * @param proxyDeviceId The device Id of the proxy * @param uidState UID state of the app noteOp/startOp was called for * @param flags OpFlags of the call + * @param accessCount The number of times the op is accessed */ public void accessed(int proxyUid, @Nullable String proxyPackageName, @Nullable String proxyAttributionTag, @Nullable String proxyDeviceId, - @AppOpsManager.UidState int uidState, @AppOpsManager.OpFlags int flags) { + @AppOpsManager.UidState int uidState, @AppOpsManager.OpFlags int flags, + int accessCount) { long accessTime = System.currentTimeMillis(); accessed(accessTime, -1, proxyUid, proxyPackageName, proxyAttributionTag, proxyDeviceId, uidState, flags); @@ -111,7 +113,7 @@ final class AttributedOp { mAppOpsService.mHistoricalRegistry.incrementOpAccessedCount(parent.op, parent.uid, parent.packageName, persistentDeviceId, tag, uidState, flags, accessTime, AppOpsManager.ATTRIBUTION_FLAGS_NONE, AppOpsManager.ATTRIBUTION_CHAIN_ID_NONE, - DiscreteRegistry.ACCESS_TYPE_NOTE_OP); + DiscreteRegistry.ACCESS_TYPE_NOTE_OP, accessCount); } /** @@ -255,7 +257,7 @@ final class AttributedOp { if (isStarted) { mAppOpsService.mHistoricalRegistry.incrementOpAccessedCount(parent.op, parent.uid, parent.packageName, persistentDeviceId, tag, uidState, flags, startTime, - attributionFlags, attributionChainId, DiscreteRegistry.ACCESS_TYPE_START_OP); + attributionFlags, attributionChainId, DiscreteRegistry.ACCESS_TYPE_START_OP, 1); } } @@ -451,7 +453,7 @@ final class AttributedOp { mAppOpsService.mHistoricalRegistry.incrementOpAccessedCount(parent.op, parent.uid, parent.packageName, persistentDeviceId, tag, event.getUidState(), event.getFlags(), startTime, event.getAttributionFlags(), - event.getAttributionChainId(), DiscreteRegistry.ACCESS_TYPE_RESUME_OP); + event.getAttributionChainId(), DiscreteRegistry.ACCESS_TYPE_RESUME_OP, 1); if (shouldSendActive) { mAppOpsService.scheduleOpActiveChangedIfNeededLocked(parent.op, parent.uid, parent.packageName, tag, event.getVirtualDeviceId(), true, diff --git a/services/core/java/com/android/server/appop/HistoricalRegistry.java b/services/core/java/com/android/server/appop/HistoricalRegistry.java index 6b0253864e2b..5e67f26ba1f6 100644 --- a/services/core/java/com/android/server/appop/HistoricalRegistry.java +++ b/services/core/java/com/android/server/appop/HistoricalRegistry.java @@ -475,7 +475,7 @@ final class HistoricalRegistry { @NonNull String deviceId, @Nullable String attributionTag, @UidState int uidState, @OpFlags int flags, long accessTime, @AppOpsManager.AttributionFlags int attributionFlags, int attributionChainId, - @DiscreteRegistry.AccessType int accessType) { + @DiscreteRegistry.AccessType int accessType, int accessCount) { synchronized (mInMemoryLock) { if (mMode == AppOpsManager.HISTORICAL_MODE_ENABLED_ACTIVE) { if (!isPersistenceInitializedMLocked()) { @@ -484,7 +484,7 @@ final class HistoricalRegistry { } getUpdatedPendingHistoricalOpsMLocked( System.currentTimeMillis()).increaseAccessCount(op, uid, packageName, - attributionTag, uidState, flags, 1); + attributionTag, uidState, flags, accessCount); mDiscreteRegistry.recordDiscreteAccess(uid, packageName, deviceId, op, attributionTag, flags, uidState, accessTime, -1, attributionFlags, diff --git a/services/core/java/com/android/server/audio/AudioServerPermissionProvider.java b/services/core/java/com/android/server/audio/AudioServerPermissionProvider.java index 473691874262..7502664a9628 100644 --- a/services/core/java/com/android/server/audio/AudioServerPermissionProvider.java +++ b/services/core/java/com/android/server/audio/AudioServerPermissionProvider.java @@ -27,6 +27,7 @@ import static android.Manifest.permission.CAPTURE_VOICE_COMMUNICATION_OUTPUT; import static android.Manifest.permission.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION; import static android.Manifest.permission.MODIFY_AUDIO_ROUTING; import static android.Manifest.permission.MODIFY_AUDIO_SETTINGS; +import static android.Manifest.permission.MODIFY_AUDIO_SETTINGS_PRIVILEGED; import static android.Manifest.permission.MODIFY_DEFAULT_AUDIO_EFFECTS; import static android.Manifest.permission.MODIFY_PHONE_STATE; import static android.Manifest.permission.RECORD_AUDIO; @@ -84,6 +85,8 @@ public class AudioServerPermissionProvider { MONITORED_PERMS[PermissionEnum.BLUETOOTH_CONNECT] = BLUETOOTH_CONNECT; MONITORED_PERMS[PermissionEnum.BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION] = BYPASS_CONCURRENT_RECORD_AUDIO_RESTRICTION; + MONITORED_PERMS[PermissionEnum.MODIFY_AUDIO_SETTINGS_PRIVILEGED] = + MODIFY_AUDIO_SETTINGS_PRIVILEGED; } private final Object mLock = new Object(); diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 2f7a54daed27..5928f8105cdf 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -95,6 +95,7 @@ import android.app.AppOpsManager; import android.app.BroadcastOptions; import android.app.IUidObserver; import android.app.NotificationManager; +import android.app.PropertyInvalidatedCache; import android.app.UidObserver; import android.app.role.OnRoleHoldersChangedListener; import android.app.role.RoleManager; @@ -248,6 +249,7 @@ import android.widget.Toast; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.os.BackgroundThread; import com.android.internal.os.SomeArgs; import com.android.internal.util.DumpUtils; import com.android.internal.util.Preconditions; @@ -4175,12 +4177,6 @@ public class AudioService extends IAudioService.Stub // Stream mute changed, fire the intent. Intent intent = new Intent(AudioManager.STREAM_MUTE_CHANGED_ACTION); intent.putExtra(AudioManager.EXTRA_STREAM_VOLUME_MUTED, isMuted); - if (replaceStreamBtSco() && isStreamBluetoothSco(streamType)) { - intent.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, - AudioSystem.STREAM_BLUETOOTH_SCO); - // in this case broadcast for both sco and voice_call streams the mute status - sendBroadcastToAll(intent, null /* options */); - } intent.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, streamType); sendBroadcastToAll(intent, null /* options */); } @@ -9663,16 +9659,9 @@ public class AudioService extends IAudioService.Stub mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, index); mVolumeChanged.putExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, oldIndex); - int extraStreamType = mStreamType; - // TODO: remove this when deprecating STREAM_BLUETOOTH_SCO - if (isStreamBluetoothSco(mStreamType)) { - mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, - AudioSystem.STREAM_BLUETOOTH_SCO); - extraStreamType = AudioSystem.STREAM_BLUETOOTH_SCO; - } else { - mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, - mStreamType); - } + + mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, + mStreamType); mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE_ALIAS, streamAlias); @@ -9683,21 +9672,9 @@ public class AudioService extends IAudioService.Stub " aliased streams: " + aliasStreamIndexes; } AudioService.sVolumeLogger.enqueue(new VolChangedBroadcastEvent( - extraStreamType, aliasStreamIndexesString, index, oldIndex)); - if (extraStreamType != mStreamType) { - AudioService.sVolumeLogger.enqueue(new VolChangedBroadcastEvent( - mStreamType, aliasStreamIndexesString, index, oldIndex)); - } + mStreamType, aliasStreamIndexesString, index, oldIndex)); } sendBroadcastToAll(mVolumeChanged, mVolumeChangedOptions); - if (extraStreamType != mStreamType) { - // send multiple intents in case we merged voice call and bt sco streams - mVolumeChanged.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, - mStreamType); - // do not use the options in thid case which could discard - // the previous intent - sendBroadcastToAll(mVolumeChanged, null); - } } } } @@ -10941,14 +10918,122 @@ public class AudioService extends IAudioService.Stub } }; mSysPropListenerNativeHandle = mAudioSystem.listenForSystemPropertyChange( - PermissionManager.CACHE_KEY_PACKAGE_INFO, + PermissionManager.CACHE_KEY_PACKAGE_INFO_NOTIFY, task); } else { mAudioSystem.listenForSystemPropertyChange( - PermissionManager.CACHE_KEY_PACKAGE_INFO, + PermissionManager.CACHE_KEY_PACKAGE_INFO_NOTIFY, () -> mAudioServerLifecycleExecutor.execute( mPermissionProvider::onPermissionStateChanged)); } + + if (PropertyInvalidatedCache.separatePermissionNotificationsEnabled()) { + new PackageInfoTransducer().start(); + } + } + + /** + * A transducer that converts high-speed changes in the CACHE_KEY_PACKAGE_INFO_CACHE + * PropertyInvalidatedCache into low-speed changes in the CACHE_KEY_PACKAGE_INFO_NOTIFY system + * property. This operates on the popcorn principle: changes in the source are done when the + * source has been quiet for the soak interval. + * + * TODO(b/381097912) This is a temporary measure to support migration away from sysprop + * sniffing. It should be cleaned up. + */ + private static class PackageInfoTransducer extends Thread { + + // The run/stop signal. + private final AtomicBoolean mRunning = new AtomicBoolean(false); + + // The source of change information. + private final PropertyInvalidatedCache.NonceWatcher mWatcher; + + // The handler for scheduling delayed reactions to changes. + private final Handler mHandler; + + // How long to soak changes: 50ms is the legacy choice. + private final static long SOAK_TIME_MS = 50; + + // The ubiquitous lock. + private final Object mLock = new Object(); + + // If positive, this is the soak expiration time. + @GuardedBy("mLock") + private long mSoakDeadlineMs = -1; + + // A source of unique long values. + @GuardedBy("mLock") + private long mToken = 0; + + PackageInfoTransducer() { + mWatcher = PropertyInvalidatedCache + .getNonceWatcher(PermissionManager.CACHE_KEY_PACKAGE_INFO_CACHE); + mHandler = new Handler(BackgroundThread.getHandler().getLooper()) { + @Override + public void handleMessage(Message msg) { + PackageInfoTransducer.this.handleMessage(msg); + }}; + } + + public void run() { + mRunning.set(true); + while (mRunning.get()) { + try { + final int changes = mWatcher.waitForChange(); + if (changes == 0 || !mRunning.get()) { + continue; + } + } catch (InterruptedException e) { + // We don't know why the exception occurred but keep running until told to + // stop. + continue; + } + trigger(); + } + } + + @GuardedBy("mLock") + private void updateLocked() { + String n = Long.toString(mToken++); + SystemProperties.set(PermissionManager.CACHE_KEY_PACKAGE_INFO_NOTIFY, n); + } + + private void trigger() { + synchronized (mLock) { + boolean alreadyQueued = mSoakDeadlineMs >= 0; + final long nowMs = SystemClock.uptimeMillis(); + mSoakDeadlineMs = nowMs + SOAK_TIME_MS; + if (!alreadyQueued) { + mHandler.sendEmptyMessageAtTime(0, mSoakDeadlineMs); + updateLocked(); + } + } + } + + private void handleMessage(Message msg) { + synchronized (mLock) { + if (mSoakDeadlineMs < 0) { + return; // ??? + } + final long nowMs = SystemClock.uptimeMillis(); + if (mSoakDeadlineMs > nowMs) { + mSoakDeadlineMs = nowMs + SOAK_TIME_MS; + mHandler.sendEmptyMessageAtTime(0, mSoakDeadlineMs); + return; + } + mSoakDeadlineMs = -1; + updateLocked(); + } + } + + /** + * Cause the thread to exit. Running is set to false and the watcher is awakened. + */ + public void done() { + mRunning.set(false); + mWatcher.wakeUp(); + } } //========================================================================================== diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index c4e10360a7cb..e10bdaab4b97 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -765,6 +765,7 @@ public class DisplayDeviceConfig { private float mBacklightMinimum = Float.NaN; private float mBacklightMaximum = Float.NaN; private float mBrightnessDefault = Float.NaN; + private float mBrightnessDim = Float.NaN; private float mBrightnessRampFastDecrease = Float.NaN; private float mBrightnessRampFastIncrease = Float.NaN; private float mBrightnessRampSlowDecrease = Float.NaN; @@ -1282,6 +1283,24 @@ public class DisplayDeviceConfig { } /** + * Return the minimum brightness on a scale of 0.0f - 1.0f + * + * @return minimum brightness + */ + public float getBrightnessMinimum() { + return getBrightnessFromBacklight(mBacklightMinimum); + } + + /** + * Return the maximum brightness on a scale of 0.0f - 1.0f + * + * @return maximum brightness + */ + public float getBrightnessMaximum() { + return getBrightnessFromBacklight(mBacklightMaximum); + } + + /** * Return the default brightness on a scale of 0.0f - 1.0f * * @return default brightness @@ -1290,6 +1309,15 @@ public class DisplayDeviceConfig { return mBrightnessDefault; } + /** + * Return the dim brightness on a scale of 0.0f - 1.0f + * + * @return dim brightness + */ + public float getBrightnessDim() { + return mBrightnessDim; + } + public float getBrightnessRampFastDecrease() { return mBrightnessRampFastDecrease; } @@ -1689,6 +1717,7 @@ public class DisplayDeviceConfig { + ", mBacklightMinimum=" + mBacklightMinimum + ", mBacklightMaximum=" + mBacklightMaximum + ", mBrightnessDefault=" + mBrightnessDefault + + ", mBrightnessDim=" + mBrightnessDim + ", mQuirks=" + mQuirks + "\n" + "mLuxThrottlingData=" + mLuxThrottlingData @@ -1906,6 +1935,7 @@ public class DisplayDeviceConfig { mBacklightMinimum = PowerManager.BRIGHTNESS_MIN; mBacklightMaximum = PowerManager.BRIGHTNESS_MAX; mBrightnessDefault = BRIGHTNESS_DEFAULT; + mBrightnessDim = PowerManager.BRIGHTNESS_INVALID; mBrightnessRampFastDecrease = PowerManager.BRIGHTNESS_MAX; mBrightnessRampFastIncrease = PowerManager.BRIGHTNESS_MAX; mBrightnessRampSlowDecrease = PowerManager.BRIGHTNESS_MAX; @@ -2003,6 +2033,15 @@ public class DisplayDeviceConfig { mBacklightMinimum = min; mBacklightMaximum = max; } + final float dim = mContext.getResources().getFloat(com.android.internal.R.dimen + .config_screenBrightnessDimFloat); + if (dim == INVALID_BRIGHTNESS_IN_CONFIG) { + mBrightnessDim = BrightnessSynchronizer.brightnessIntToFloat( + mContext.getResources().getInteger(com.android.internal.R.integer + .config_screenBrightnessDim)); + } else { + mBrightnessDim = dim; + } } private void loadBrightnessMap(DisplayConfiguration config) { diff --git a/services/core/java/com/android/server/display/DisplayDeviceInfo.java b/services/core/java/com/android/server/display/DisplayDeviceInfo.java index 1c1bdad01034..3aaf4f6fe85a 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceInfo.java +++ b/services/core/java/com/android/server/display/DisplayDeviceInfo.java @@ -477,6 +477,7 @@ final class DisplayDeviceInfo { public float brightnessMinimum; public float brightnessMaximum; public float brightnessDefault; + public float brightnessDim; // NaN means unsupported public float hdrSdrRatio = Float.NaN; @@ -561,8 +562,8 @@ final class DisplayDeviceInfo { || !Objects.equals(ownerPackageName, other.ownerPackageName) || !BrightnessSynchronizer.floatEquals(brightnessMinimum, other.brightnessMinimum) || !BrightnessSynchronizer.floatEquals(brightnessMaximum, other.brightnessMaximum) - || !BrightnessSynchronizer.floatEquals(brightnessDefault, - other.brightnessDefault) + || !BrightnessSynchronizer.floatEquals(brightnessDefault, other.brightnessDefault) + || !BrightnessSynchronizer.floatEquals(brightnessDim, other.brightnessDim) || !Objects.equals(roundedCorners, other.roundedCorners) || installOrientation != other.installOrientation || !Objects.equals(displayShape, other.displayShape) @@ -618,6 +619,7 @@ final class DisplayDeviceInfo { brightnessMinimum = other.brightnessMinimum; brightnessMaximum = other.brightnessMaximum; brightnessDefault = other.brightnessDefault; + brightnessDim = other.brightnessDim; hdrSdrRatio = other.hdrSdrRatio; roundedCorners = other.roundedCorners; installOrientation = other.installOrientation; @@ -672,6 +674,7 @@ final class DisplayDeviceInfo { sb.append(", brightnessMinimum ").append(brightnessMinimum); sb.append(", brightnessMaximum ").append(brightnessMaximum); sb.append(", brightnessDefault ").append(brightnessDefault); + sb.append(", brightnessDim ").append(brightnessDim); sb.append(", hdrSdrRatio ").append(hdrSdrRatio); if (roundedCorners != null) { sb.append(", roundedCorners ").append(roundedCorners); diff --git a/services/core/java/com/android/server/display/LocalDisplayAdapter.java b/services/core/java/com/android/server/display/LocalDisplayAdapter.java index 0b8f7d5ef2cf..d37dd3018fde 100644 --- a/services/core/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/core/java/com/android/server/display/LocalDisplayAdapter.java @@ -812,9 +812,10 @@ final class LocalDisplayAdapter extends DisplayAdapter { // The display is trusted since it is created by system. mInfo.flags |= DisplayDeviceInfo.FLAG_TRUSTED; - mInfo.brightnessMinimum = PowerManager.BRIGHTNESS_MIN; - mInfo.brightnessMaximum = PowerManager.BRIGHTNESS_MAX; + mInfo.brightnessMinimum = getDisplayDeviceConfig().getBrightnessMinimum(); + mInfo.brightnessMaximum = getDisplayDeviceConfig().getBrightnessMaximum(); mInfo.brightnessDefault = getDisplayDeviceConfig().getBrightnessDefault(); + mInfo.brightnessDim = getDisplayDeviceConfig().getBrightnessDim(); mInfo.hdrSdrRatio = mCurrentHdrSdrRatio; } return mInfo; diff --git a/services/core/java/com/android/server/display/LogicalDisplay.java b/services/core/java/com/android/server/display/LogicalDisplay.java index 85465981c473..1de9c9589fb9 100644 --- a/services/core/java/com/android/server/display/LogicalDisplay.java +++ b/services/core/java/com/android/server/display/LogicalDisplay.java @@ -548,6 +548,7 @@ final class LogicalDisplay { mBaseDisplayInfo.brightnessMinimum = deviceInfo.brightnessMinimum; mBaseDisplayInfo.brightnessMaximum = deviceInfo.brightnessMaximum; mBaseDisplayInfo.brightnessDefault = deviceInfo.brightnessDefault; + mBaseDisplayInfo.brightnessDim = deviceInfo.brightnessDim; mBaseDisplayInfo.hdrSdrRatio = deviceInfo.hdrSdrRatio; mBaseDisplayInfo.roundedCorners = deviceInfo.roundedCorners; mBaseDisplayInfo.installOrientation = deviceInfo.installOrientation; diff --git a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java index 6ae58c432081..836f4ede8f57 100644 --- a/services/core/java/com/android/server/display/VirtualDisplayAdapter.java +++ b/services/core/java/com/android/server/display/VirtualDisplayAdapter.java @@ -340,6 +340,7 @@ public class VirtualDisplayAdapter extends DisplayAdapter { private boolean mIsWindowManagerMirroring; private final DisplayCutout mDisplayCutout; private final float mDefaultBrightness; + private final float mDimBrightness; private float mCurrentBrightness; private final IBrightnessListener mBrightnessListener; @@ -359,6 +360,7 @@ public class VirtualDisplayAdapter extends DisplayAdapter { mRequestedRefreshRate = virtualDisplayConfig.getRequestedRefreshRate(); mDisplayCutout = virtualDisplayConfig.getDisplayCutout(); mDefaultBrightness = virtualDisplayConfig.getDefaultBrightness(); + mDimBrightness = virtualDisplayConfig.getDimBrightness(); mCurrentBrightness = PowerManager.BRIGHTNESS_INVALID; mBrightnessListener = virtualDisplayConfig.getBrightnessListener(); mMode = createMode(mWidth, mHeight, getRefreshRate()); @@ -645,6 +647,7 @@ public class VirtualDisplayAdapter extends DisplayAdapter { mInfo.brightnessMinimum = PowerManager.BRIGHTNESS_MIN; mInfo.brightnessMaximum = PowerManager.BRIGHTNESS_MAX; mInfo.brightnessDefault = mDefaultBrightness; + mInfo.brightnessDim = mDimBrightness; mInfo.ownerUid = mOwnerUid; mInfo.ownerPackageName = mOwnerPackageName; diff --git a/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java b/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java index 7ccab0504c68..440a271d7f76 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java +++ b/services/core/java/com/android/server/display/brightness/clamper/BrightnessClamperController.java @@ -81,6 +81,8 @@ public class BrightnessClamperController { } }; + private volatile boolean mStarted = false; + public BrightnessClamperController(Handler handler, ClamperChangeListener clamperChangeListener, DisplayDeviceData data, Context context, DisplayManagerFlags flags, SensorManager sensorManager, float currentBrightness) { @@ -100,10 +102,10 @@ public class BrightnessClamperController { mClamperChangeListenerExternal = clamperChangeListener; mExecutor = new HandlerExecutor(handler); - Runnable clamperChangeRunnableInternal = this::recalculateBrightnessCap; + Runnable modifiersChangeRunnableInternal = this::recalculateModifiersState; ClamperChangeListener clamperChangeListenerInternal = () -> { - if (!mHandler.hasCallbacks(clamperChangeRunnableInternal)) { - mHandler.post(clamperChangeRunnableInternal); + if (mStarted && !mHandler.hasCallbacks(modifiersChangeRunnableInternal)) { + mHandler.post(modifiersChangeRunnableInternal); } }; @@ -187,6 +189,7 @@ public class BrightnessClamperController { * Called in DisplayControllerHandler */ public void stop() { + mStarted = false; mDeviceConfigParameterProvider.removeOnPropertiesChangedListener( mOnPropertiesChangedListener); mLightSensorController.stop(); @@ -195,9 +198,9 @@ public class BrightnessClamperController { // Called in DisplayControllerHandler - private void recalculateBrightnessCap() { + private void recalculateModifiersState() { ModifiersAggregatedState newAggregatedState = new ModifiersAggregatedState(); - mStatefulModifiers.forEach((clamper) -> clamper.applyStateChange(newAggregatedState)); + mStatefulModifiers.forEach((modifier) -> modifier.applyStateChange(newAggregatedState)); if (needToNotifyExternalListener(mModifiersAggregatedState, newAggregatedState)) { mClamperChangeListenerExternal.onChanged(); @@ -223,6 +226,7 @@ public class BrightnessClamperController { mExecutor, mOnPropertiesChangedListener); } adjustLightSensorSubscription(); + mStarted = true; } private void adjustLightSensorSubscription() { @@ -267,7 +271,7 @@ public class BrightnessClamperController { } } - modifiers.add(new DisplayDimModifier(context)); + modifiers.add(new DisplayDimModifier(data.mDisplayId, context)); modifiers.add(new BrightnessLowPowerModeModifier()); if (flags.isEvenDimmerEnabled() && data.mDisplayDeviceConfig.isEvenDimmerAvailable()) { modifiers.add(new BrightnessLowLuxModifier(handler, listener, context, diff --git a/services/core/java/com/android/server/display/brightness/clamper/DisplayDimModifier.java b/services/core/java/com/android/server/display/brightness/clamper/DisplayDimModifier.java index ab880bf28743..0237af338b18 100644 --- a/services/core/java/com/android/server/display/brightness/clamper/DisplayDimModifier.java +++ b/services/core/java/com/android/server/display/brightness/clamper/DisplayDimModifier.java @@ -38,12 +38,12 @@ class DisplayDimModifier extends BrightnessModifier { // mScreenBrightnessDimConfig. private final float mScreenBrightnessMinimumDimAmount; - DisplayDimModifier(Context context) { + DisplayDimModifier(int displayId, Context context) { PowerManager pm = Objects.requireNonNull(context.getSystemService(PowerManager.class)); Resources resources = context.getResources(); mScreenBrightnessDimConfig = BrightnessUtils.clampAbsoluteBrightness( - pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DIM)); + pm.getBrightnessConstraint(displayId, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DIM)); mScreenBrightnessMinimumDimAmount = resources.getFloat( R.dimen.config_screenBrightnessMinimumDimAmountFloat); } diff --git a/services/core/java/com/android/server/input/InputDataStore.java b/services/core/java/com/android/server/input/InputDataStore.java new file mode 100644 index 000000000000..e8f21fe8fb74 --- /dev/null +++ b/services/core/java/com/android/server/input/InputDataStore.java @@ -0,0 +1,344 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input; + +import android.hardware.input.AppLaunchData; +import android.hardware.input.InputGestureData; +import android.os.Environment; +import android.util.AtomicFile; +import android.util.Slog; +import android.util.SparseArray; +import android.util.Xml; + +import com.android.internal.annotations.VisibleForTesting; +import com.android.modules.utils.TypedXmlPullParser; +import com.android.modules.utils.TypedXmlSerializer; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; + +/** + * Manages persistent state recorded by the input manager service as a set of XML files. + * Caller must acquire lock on the data store before accessing it. + */ +public final class InputDataStore { + private static final String TAG = "InputDataStore"; + + private static final String INPUT_MANAGER_DIRECTORY = "input"; + + private static final String TAG_ROOT = "root"; + + private static final String TAG_INPUT_GESTURE_LIST = "input_gesture_list"; + private static final String TAG_INPUT_GESTURE = "input_gesture"; + private static final String TAG_KEY_TRIGGER = "key_trigger"; + private static final String TAG_TOUCHPAD_TRIGGER = "touchpad_trigger"; + private static final String TAG_APP_LAUNCH_DATA = "app_launch_data"; + + private static final String ATTR_KEY_TRIGGER_KEYCODE = "keycode"; + private static final String ATTR_KEY_TRIGGER_MODIFIER_STATE = "modifiers"; + private static final String ATTR_KEY_GESTURE_TYPE = "key_gesture_type"; + private static final String ATTR_TOUCHPAD_TRIGGER_GESTURE_TYPE = "touchpad_gesture_type"; + private static final String ATTR_APP_LAUNCH_DATA_CATEGORY = "category"; + private static final String ATTR_APP_LAUNCH_DATA_ROLE = "role"; + private static final String ATTR_APP_LAUNCH_DATA_PACKAGE_NAME = "package_name"; + private static final String ATTR_APP_LAUNCH_DATA_CLASS_NAME = "class_name"; + + private final FileInjector mInputGestureFileInjector; + + public InputDataStore() { + this(new FileInjector("input_gestures.xml")); + } + + public InputDataStore(final FileInjector inputGestureFileInjector) { + mInputGestureFileInjector = inputGestureFileInjector; + } + + /** + * Reads from the local disk storage the list of customized input gestures. + * + * @param userId The user id to fetch the gestures for. + * @return List of {@link InputGestureData} which the user previously customized. + */ + public List<InputGestureData> loadInputGestures(int userId) { + List<InputGestureData> inputGestureDataList; + try { + final InputStream inputStream = mInputGestureFileInjector.openRead(userId); + inputGestureDataList = readInputGesturesXml(inputStream, false); + inputStream.close(); + } catch (IOException exception) { + // In case we are unable to read from the file on disk or another IO operation error, + // fail gracefully. + Slog.e(TAG, "Failed to read from " + mInputGestureFileInjector.getAtomicFileForUserId( + userId), exception); + return List.of(); + } catch (Exception exception) { + // In the case of any other exception, we want it to bubble up as this would be due + // to malformed trusted XML data. + throw new RuntimeException( + "Failed to read from " + mInputGestureFileInjector.getAtomicFileForUserId( + userId), exception); + } + return inputGestureDataList; + } + + /** + * Writes to the local disk storage the list of customized input gestures provided as a param. + * + * @param userId The user id to store the {@link InputGestureData} list under. + * @param inputGestureDataList The list of custom input gestures for the given {@code userId}. + */ + public void saveInputGestures(int userId, List<InputGestureData> inputGestureDataList) { + FileOutputStream outputStream = null; + try { + outputStream = mInputGestureFileInjector.startWrite(userId); + writeInputGestureXml(outputStream, false, inputGestureDataList); + mInputGestureFileInjector.finishWrite(userId, outputStream, true); + } catch (IOException e) { + Slog.e(TAG, + "Failed to write to file " + mInputGestureFileInjector.getAtomicFileForUserId( + userId), e); + mInputGestureFileInjector.finishWrite(userId, outputStream, false); + } + } + + @VisibleForTesting + List<InputGestureData> readInputGesturesXml(InputStream stream, boolean utf8Encoded) + throws XmlPullParserException, IOException { + List<InputGestureData> inputGestureDataList = new ArrayList<>(); + TypedXmlPullParser parser; + if (utf8Encoded) { + parser = Xml.newFastPullParser(); + parser.setInput(stream, StandardCharsets.UTF_8.name()); + } else { + parser = Xml.resolvePullParser(stream); + } + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) { + if (type != XmlPullParser.START_TAG) { + continue; + } + final String tag = parser.getName(); + if (TAG_ROOT.equals(tag)) { + continue; + } + + if (TAG_INPUT_GESTURE_LIST.equals(tag)) { + inputGestureDataList.addAll(readInputGestureListFromXml(parser)); + } + } + return inputGestureDataList; + } + + private InputGestureData readInputGestureFromXml(TypedXmlPullParser parser) + throws XmlPullParserException, IOException, IllegalArgumentException { + InputGestureData.Builder builder = new InputGestureData.Builder(); + builder.setKeyGestureType(parser.getAttributeInt(null, ATTR_KEY_GESTURE_TYPE)); + int outerDepth = parser.getDepth(); + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) { + // If the parser has left the initial scope when it was called, break out. + if (outerDepth > parser.getDepth()) { + throw new RuntimeException( + "Parser has left the initial scope of the tag that was being parsed on " + + "line number: " + + parser.getLineNumber()); + } + + // If the parser has reached the closing tag for the Input Gesture, break out. + if (type == XmlPullParser.END_TAG && parser.getName().equals(TAG_INPUT_GESTURE)) { + break; + } + + if (type != XmlPullParser.START_TAG) { + continue; + } + + final String tag = parser.getName(); + if (TAG_KEY_TRIGGER.equals(tag)) { + builder.setTrigger(InputGestureData.createKeyTrigger( + parser.getAttributeInt(null, ATTR_KEY_TRIGGER_KEYCODE), + parser.getAttributeInt(null, ATTR_KEY_TRIGGER_MODIFIER_STATE))); + } else if (TAG_TOUCHPAD_TRIGGER.equals(tag)) { + builder.setTrigger(InputGestureData.createTouchpadTrigger( + parser.getAttributeInt(null, ATTR_TOUCHPAD_TRIGGER_GESTURE_TYPE))); + } else if (TAG_APP_LAUNCH_DATA.equals(tag)) { + final String roleValue = parser.getAttributeValue(null, ATTR_APP_LAUNCH_DATA_ROLE); + final String categoryValue = parser.getAttributeValue(null, + ATTR_APP_LAUNCH_DATA_CATEGORY); + final String classNameValue = parser.getAttributeValue(null, + ATTR_APP_LAUNCH_DATA_CLASS_NAME); + final String packageNameValue = parser.getAttributeValue(null, + ATTR_APP_LAUNCH_DATA_PACKAGE_NAME); + final AppLaunchData appLaunchData = AppLaunchData.createLaunchData(categoryValue, + roleValue, packageNameValue, classNameValue); + if (appLaunchData != null) { + builder.setAppLaunchData(appLaunchData); + } + } + } + return builder.build(); + } + + private List<InputGestureData> readInputGestureListFromXml(TypedXmlPullParser parser) throws + XmlPullParserException, IOException { + List<InputGestureData> inputGestureDataList = new ArrayList<>(); + final int outerDepth = parser.getDepth(); + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT) { + // If the parser has left the initial scope when it was called, break out. + if (outerDepth > parser.getDepth()) { + throw new RuntimeException( + "Parser has left the initial scope of the tag that was being parsed on " + + "line number: " + + parser.getLineNumber()); + } + + // If the parser has reached the closing tag for the Input Gesture List, break out. + if (type == XmlPullParser.END_TAG && parser.getName().equals(TAG_INPUT_GESTURE_LIST)) { + break; + } + + if (type != XmlPullParser.START_TAG) { + continue; + } + + final String tag = parser.getName(); + if (TAG_INPUT_GESTURE.equals(tag)) { + try { + inputGestureDataList.add(readInputGestureFromXml(parser)); + } catch (IllegalArgumentException exception) { + Slog.w(TAG, "Invalid parameters for input gesture data: ", exception); + continue; + } + } + } + return inputGestureDataList; + } + + @VisibleForTesting + void writeInputGestureXml(OutputStream stream, boolean utf8Encoded, + List<InputGestureData> inputGestureDataList) throws IOException { + final TypedXmlSerializer serializer; + if (utf8Encoded) { + serializer = Xml.newFastSerializer(); + serializer.setOutput(stream, StandardCharsets.UTF_8.name()); + } else { + serializer = Xml.resolveSerializer(stream); + } + + serializer.startDocument(null, true); + serializer.startTag(null, TAG_ROOT); + writeInputGestureListToXml(serializer, inputGestureDataList); + serializer.endTag(null, TAG_ROOT); + serializer.endDocument(); + } + + private void writeInputGestureToXml(TypedXmlSerializer serializer, + InputGestureData inputGestureData) throws IOException { + serializer.startTag(null, TAG_INPUT_GESTURE); + serializer.attributeInt(null, ATTR_KEY_GESTURE_TYPE, + inputGestureData.getAction().keyGestureType()); + + final InputGestureData.Trigger trigger = inputGestureData.getTrigger(); + if (trigger instanceof InputGestureData.KeyTrigger keyTrigger) { + serializer.startTag(null, TAG_KEY_TRIGGER); + serializer.attributeInt(null, ATTR_KEY_TRIGGER_KEYCODE, keyTrigger.getKeycode()); + serializer.attributeInt(null, ATTR_KEY_TRIGGER_MODIFIER_STATE, + keyTrigger.getModifierState()); + serializer.endTag(null, TAG_KEY_TRIGGER); + } else if (trigger instanceof InputGestureData.TouchpadTrigger touchpadTrigger) { + serializer.startTag(null, TAG_TOUCHPAD_TRIGGER); + serializer.attributeInt(null, ATTR_TOUCHPAD_TRIGGER_GESTURE_TYPE, + touchpadTrigger.getTouchpadGestureType()); + serializer.endTag(null, TAG_TOUCHPAD_TRIGGER); + } + + if (inputGestureData.getAction().appLaunchData() != null) { + serializer.startTag(null, TAG_APP_LAUNCH_DATA); + final AppLaunchData appLaunchData = inputGestureData.getAction().appLaunchData(); + if (appLaunchData instanceof AppLaunchData.RoleData roleData) { + serializer.attribute(null, ATTR_APP_LAUNCH_DATA_ROLE, roleData.getRole()); + } else if (appLaunchData + instanceof AppLaunchData.CategoryData categoryData) { + serializer.attribute(null, ATTR_APP_LAUNCH_DATA_CATEGORY, + categoryData.getCategory()); + } else if (appLaunchData instanceof AppLaunchData.ComponentData componentData) { + serializer.attribute(null, ATTR_APP_LAUNCH_DATA_PACKAGE_NAME, + componentData.getPackageName()); + serializer.attribute(null, ATTR_APP_LAUNCH_DATA_CLASS_NAME, + componentData.getClassName()); + } + serializer.endTag(null, TAG_APP_LAUNCH_DATA); + } + + serializer.endTag(null, TAG_INPUT_GESTURE); + } + + private void writeInputGestureListToXml(TypedXmlSerializer serializer, + List<InputGestureData> inputGestureDataList) throws IOException { + serializer.startTag(null, TAG_INPUT_GESTURE_LIST); + for (final InputGestureData inputGestureData : inputGestureDataList) { + writeInputGestureToXml(serializer, inputGestureData); + } + serializer.endTag(null, TAG_INPUT_GESTURE_LIST); + } + + @VisibleForTesting + static class FileInjector { + private final SparseArray<AtomicFile> mAtomicFileMap = new SparseArray<>(); + private final String mFileName; + + FileInjector(String fileName) { + mFileName = fileName; + } + + InputStream openRead(int userId) throws FileNotFoundException { + return getAtomicFileForUserId(userId).openRead(); + } + + FileOutputStream startWrite(int userId) throws IOException { + return getAtomicFileForUserId(userId).startWrite(); + } + + void finishWrite(int userId, FileOutputStream os, boolean success) { + if (success) { + getAtomicFileForUserId(userId).finishWrite(os); + } else { + getAtomicFileForUserId(userId).failWrite(os); + } + } + + AtomicFile getAtomicFileForUserId(int userId) { + if (!mAtomicFileMap.contains(userId)) { + mAtomicFileMap.put(userId, new AtomicFile(new File( + Environment.buildPath(Environment.getDataSystemDeDirectory(userId), + INPUT_MANAGER_DIRECTORY), mFileName))); + } + return mAtomicFileMap.get(userId); + } + } +} diff --git a/services/core/java/com/android/server/input/InputFeatureFlagProvider.java b/services/core/java/com/android/server/input/InputFeatureFlagProvider.java deleted file mode 100644 index a646d1e9bcb0..000000000000 --- a/services/core/java/com/android/server/input/InputFeatureFlagProvider.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.server.input; - -import android.sysprop.InputProperties; - -import java.util.Optional; - -/** - * A component of {@link InputManagerService} responsible for managing the input sysprop flags - * - * @hide - */ -@SuppressWarnings("OptionalUsedAsFieldOrParameterType") -public final class InputFeatureFlagProvider { - - // To disable Keyboard backlight control via Framework, run: - // 'adb shell setprop persist.input.keyboard_backlight_control.enabled false' (requires restart) - private static final boolean KEYBOARD_BACKLIGHT_CONTROL_ENABLED = - InputProperties.enable_keyboard_backlight_control().orElse(true); - - // To disable Framework controlled keyboard backlight animation run: - // adb shell setprop persist.input.keyboard.backlight_animation.enabled false (requires restart) - private static final boolean KEYBOARD_BACKLIGHT_ANIMATION_ENABLED = - InputProperties.enable_keyboard_backlight_animation().orElse(false); - - // To disable Custom keyboard backlight levels support via IDC files run: - // adb shell setprop persist.input.keyboard.backlight_custom_levels.enabled false (requires - // restart) - private static final boolean KEYBOARD_BACKLIGHT_CUSTOM_LEVELS_ENABLED = - InputProperties.enable_keyboard_backlight_custom_levels().orElse(true); - - // To disable als based ambient keyboard backlight control run: - // adb shell setprop persist.input.keyboard.ambient_backlight_control.enabled false (requires - // restart) - private static final boolean AMBIENT_KEYBOARD_BACKLIGHT_CONTROL_ENABLED = - InputProperties.enable_ambient_keyboard_backlight_control().orElse(true); - - private static Optional<Boolean> sKeyboardBacklightControlOverride = Optional.empty(); - private static Optional<Boolean> sKeyboardBacklightAnimationOverride = Optional.empty(); - private static Optional<Boolean> sKeyboardBacklightCustomLevelsOverride = Optional.empty(); - private static Optional<Boolean> sAmbientKeyboardBacklightControlOverride = Optional.empty(); - - public static boolean isKeyboardBacklightControlEnabled() { - return sKeyboardBacklightControlOverride.orElse(KEYBOARD_BACKLIGHT_CONTROL_ENABLED); - } - - public static boolean isKeyboardBacklightAnimationEnabled() { - return sKeyboardBacklightAnimationOverride.orElse(KEYBOARD_BACKLIGHT_ANIMATION_ENABLED); - } - - public static boolean isKeyboardBacklightCustomLevelsEnabled() { - return sKeyboardBacklightCustomLevelsOverride.orElse( - KEYBOARD_BACKLIGHT_CUSTOM_LEVELS_ENABLED); - } - - public static boolean isAmbientKeyboardBacklightControlEnabled() { - return sAmbientKeyboardBacklightControlOverride.orElse( - AMBIENT_KEYBOARD_BACKLIGHT_CONTROL_ENABLED); - } - - public static void setKeyboardBacklightControlEnabled(boolean enabled) { - sKeyboardBacklightControlOverride = Optional.of(enabled); - } - - public static void setKeyboardBacklightAnimationEnabled(boolean enabled) { - sKeyboardBacklightAnimationOverride = Optional.of(enabled); - } - - public static void setKeyboardBacklightCustomLevelsEnabled(boolean enabled) { - sKeyboardBacklightCustomLevelsOverride = Optional.of(enabled); - } - - public static void setAmbientKeyboardBacklightControlEnabled(boolean enabled) { - sAmbientKeyboardBacklightControlOverride = Optional.of(enabled); - } - - /** - * Clears all input feature flag overrides. - */ - public static void clearOverrides() { - sKeyboardBacklightControlOverride = Optional.empty(); - sKeyboardBacklightAnimationOverride = Optional.empty(); - sKeyboardBacklightCustomLevelsOverride = Optional.empty(); - sAmbientKeyboardBacklightControlOverride = Optional.empty(); - } -} diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 1adf1c99024a..767a7232809d 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -181,6 +181,7 @@ public class InputManagerService extends IInputManager.Stub private static final int MSG_RELOAD_DEVICE_ALIASES = 2; private static final int MSG_DELIVER_TABLET_MODE_CHANGED = 3; private static final int MSG_CURRENT_USER_CHANGED = 4; + private static final int MSG_SYSTEM_READY = 5; private static final int DEFAULT_VIBRATION_MAGNITUDE = 192; private static final AdditionalDisplayInputProperties @@ -351,6 +352,9 @@ public class InputManagerService extends IInputManager.Stub // Manages loading PointerIcons private final PointerIconCache mPointerIconCache; + // Manages storage and retrieval of input data. + private final InputDataStore mInputDataStore; + // Maximum number of milliseconds to wait for input event injection. private static final int INJECTION_TIMEOUT_MILLIS = 30 * 1000; @@ -471,11 +475,9 @@ public class InputManagerService extends IInputManager.Stub } KeyboardBacklightControllerInterface getKeyboardBacklightController( - NativeInputManagerService nativeService, PersistentDataStore dataStore) { - return InputFeatureFlagProvider.isKeyboardBacklightControlEnabled() - ? new KeyboardBacklightController(mContext, nativeService, dataStore, - mLooper, mUEventManager) - : new KeyboardBacklightControllerInterface() {}; + NativeInputManagerService nativeService) { + return new KeyboardBacklightController(mContext, nativeService, mLooper, + mUEventManager); } } @@ -500,9 +502,11 @@ public class InputManagerService extends IInputManager.Stub injector.getLooper(), this) : null; mBatteryController = new BatteryController(mContext, mNative, injector.getLooper(), injector.getUEventManager()); - mKeyboardBacklightController = injector.getKeyboardBacklightController(mNative, mDataStore); + mKeyboardBacklightController = injector.getKeyboardBacklightController(mNative); mStickyModifierStateController = new StickyModifierStateController(); - mKeyGestureController = new KeyGestureController(mContext, injector.getLooper()); + mInputDataStore = new InputDataStore(); + mKeyGestureController = new KeyGestureController(mContext, injector.getLooper(), + mInputDataStore); mKeyboardLedController = new KeyboardLedController(mContext, injector.getLooper(), mNative); mKeyRemapper = new KeyRemapper(mContext, mNative, mDataStore, injector.getLooper()); @@ -566,6 +570,14 @@ public class InputManagerService extends IInputManager.Stub Watchdog.getInstance().addMonitor(this); } + private void onBootPhase(int phase) { + // On ActivityManager thread, shift to handler to avoid blocking other system services in + // this boot phase. + if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) { + mHandler.sendEmptyMessage(MSG_SYSTEM_READY); + } + } + // TODO(BT) Pass in parameter for bluetooth system public void systemRunning() { if (DEBUG) { @@ -3222,6 +3234,9 @@ public class InputManagerService extends IInputManager.Stub case MSG_CURRENT_USER_CHANGED: handleCurrentUserChanged((int) msg.obj); break; + case MSG_SYSTEM_READY: + systemRunning(); + break; } } } @@ -3426,10 +3441,7 @@ public class InputManagerService extends IInputManager.Stub @Override public void onBootPhase(int phase) { - // Called on ActivityManager thread. - if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) { - mService.systemRunning(); - } + mService.onBootPhase(phase); } @Override diff --git a/services/core/java/com/android/server/input/KeyGestureController.java b/services/core/java/com/android/server/input/KeyGestureController.java index 55d2de2b6865..99c01ce5c15a 100644 --- a/services/core/java/com/android/server/input/KeyGestureController.java +++ b/services/core/java/com/android/server/input/KeyGestureController.java @@ -92,6 +92,8 @@ final class KeyGestureController { | KeyEvent.META_SHIFT_ON; private static final int MSG_NOTIFY_KEY_GESTURE_EVENT = 1; + private static final int MSG_PERSIST_CUSTOM_GESTURES = 2; + private static final int MSG_LOAD_CUSTOM_GESTURES = 3; // must match: config_settingsKeyBehavior in config.xml private static final int SETTINGS_KEY_BEHAVIOR_SETTINGS_ACTIVITY = 0; @@ -116,6 +118,8 @@ final class KeyGestureController { private final SettingsObserver mSettingsObserver; private final AppLaunchShortcutManager mAppLaunchShortcutManager; private final InputGestureManager mInputGestureManager; + @GuardedBy("mInputDataStore") + private final InputDataStore mInputDataStore; private static final Object mUserLock = new Object(); @UserIdInt @GuardedBy("mUserLock") @@ -155,7 +159,7 @@ final class KeyGestureController { /** Currently fully consumed key codes per device */ private final SparseArray<Set<Integer>> mConsumedKeysForDevice = new SparseArray<>(); - KeyGestureController(Context context, Looper looper) { + KeyGestureController(Context context, Looper looper, InputDataStore inputDataStore) { mContext = context; mHandler = new Handler(looper, this::handleMessage); mSystemPid = Process.myPid(); @@ -175,6 +179,7 @@ final class KeyGestureController { mSettingsObserver = new SettingsObserver(mHandler); mAppLaunchShortcutManager = new AppLaunchShortcutManager(mContext); mInputGestureManager = new InputGestureManager(mContext); + mInputDataStore = inputDataStore; initBehaviors(); initKeyCombinationRules(); } @@ -434,6 +439,13 @@ final class KeyGestureController { mSettingsObserver.observe(); mAppLaunchShortcutManager.systemRunning(); mInputGestureManager.systemRunning(); + + int userId; + synchronized (mUserLock) { + userId = mCurrentUserId; + } + // Load the system user's input gestures. + mHandler.obtainMessage(MSG_LOAD_CUSTOM_GESTURES, userId).sendToTarget(); } public boolean interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) { @@ -955,6 +967,7 @@ final class KeyGestureController { synchronized (mUserLock) { mCurrentUserId = userId; } + mHandler.obtainMessage(MSG_LOAD_CUSTOM_GESTURES, userId).sendToTarget(); } @MainThread @@ -995,6 +1008,17 @@ final class KeyGestureController { AidlKeyGestureEvent event = (AidlKeyGestureEvent) msg.obj; notifyKeyGestureEvent(event); break; + case MSG_PERSIST_CUSTOM_GESTURES: { + final int userId = (Integer) msg.obj; + persistInputGestures(userId); + break; + } + case MSG_LOAD_CUSTOM_GESTURES: { + final int userId = (Integer) msg.obj; + loadInputGestures(userId); + break; + } + } return true; } @@ -1040,22 +1064,31 @@ final class KeyGestureController { @InputManager.CustomInputGestureResult public int addCustomInputGesture(@UserIdInt int userId, @NonNull AidlInputGestureData inputGestureData) { - return mInputGestureManager.addCustomInputGesture(userId, + final int result = mInputGestureManager.addCustomInputGesture(userId, new InputGestureData(inputGestureData)); + if (result == InputManager.CUSTOM_INPUT_GESTURE_RESULT_SUCCESS) { + mHandler.obtainMessage(MSG_PERSIST_CUSTOM_GESTURES, userId).sendToTarget(); + } + return result; } @BinderThread @InputManager.CustomInputGestureResult public int removeCustomInputGesture(@UserIdInt int userId, @NonNull AidlInputGestureData inputGestureData) { - return mInputGestureManager.removeCustomInputGesture(userId, + final int result = mInputGestureManager.removeCustomInputGesture(userId, new InputGestureData(inputGestureData)); + if (result == InputManager.CUSTOM_INPUT_GESTURE_RESULT_SUCCESS) { + mHandler.obtainMessage(MSG_PERSIST_CUSTOM_GESTURES, userId).sendToTarget(); + } + return result; } @BinderThread public void removeAllCustomInputGestures(@UserIdInt int userId, @Nullable InputGestureData.Filter filter) { mInputGestureManager.removeAllCustomInputGestures(userId, filter); + mHandler.obtainMessage(MSG_PERSIST_CUSTOM_GESTURES, userId).sendToTarget(); } @BinderThread @@ -1166,6 +1199,26 @@ final class KeyGestureController { } } + private void persistInputGestures(int userId) { + synchronized (mInputDataStore) { + final List<InputGestureData> inputGestureDataList = + mInputGestureManager.getCustomInputGestures(userId, + null); + mInputDataStore.saveInputGestures(userId, inputGestureDataList); + } + } + + private void loadInputGestures(int userId) { + synchronized (mInputDataStore) { + mInputGestureManager.removeAllCustomInputGestures(userId, null); + final List<InputGestureData> inputGestureDataList = mInputDataStore.loadInputGestures( + userId); + for (final InputGestureData inputGestureData : inputGestureDataList) { + mInputGestureManager.addCustomInputGesture(userId, inputGestureData); + } + } + } + // A record of a registered key gesture event listener from one process. private class KeyGestureHandlerRecord implements IBinder.DeathRecipient { public final int mPid; diff --git a/services/core/java/com/android/server/input/KeyboardBacklightController.java b/services/core/java/com/android/server/input/KeyboardBacklightController.java index 0defd27eaae2..16368c7678d1 100644 --- a/services/core/java/com/android/server/input/KeyboardBacklightController.java +++ b/services/core/java/com/android/server/input/KeyboardBacklightController.java @@ -33,6 +33,7 @@ import android.os.Message; import android.os.RemoteException; import android.os.SystemClock; import android.os.UEventObserver; +import android.sysprop.InputProperties; import android.text.TextUtils; import android.util.IndentingPrintWriter; import android.util.Log; @@ -47,7 +48,6 @@ import java.io.PrintWriter; import java.time.Duration; import java.util.Arrays; import java.util.Objects; -import java.util.OptionalInt; import java.util.TreeSet; /** @@ -63,6 +63,10 @@ final class KeyboardBacklightController implements // 'adb shell setprop log.tag.KbdBacklightController DEBUG' (requires restart) private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); + // To disable Framework controlled keyboard backlight animation run: + // adb shell setprop persist.input.keyboard.backlight_animation.enabled false (requires restart) + private final boolean mKeyboardBacklightAnimationEnabled; + private enum Direction { DIRECTION_UP, DIRECTION_DOWN } @@ -87,9 +91,6 @@ final class KeyboardBacklightController implements private final Context mContext; private final NativeInputManagerService mNative; - // The PersistentDataStore should be locked before use. - @GuardedBy("mDataStore") - private final PersistentDataStore mDataStore; private final Handler mHandler; private final AnimatorFactory mAnimatorFactory; private final UEventManager mUEventManager; @@ -123,17 +124,15 @@ final class KeyboardBacklightController implements } KeyboardBacklightController(Context context, NativeInputManagerService nativeService, - PersistentDataStore dataStore, Looper looper, UEventManager uEventManager) { - this(context, nativeService, dataStore, looper, ValueAnimator::ofInt, uEventManager); + Looper looper, UEventManager uEventManager) { + this(context, nativeService, looper, ValueAnimator::ofInt, uEventManager); } @VisibleForTesting KeyboardBacklightController(Context context, NativeInputManagerService nativeService, - PersistentDataStore dataStore, Looper looper, AnimatorFactory animatorFactory, - UEventManager uEventManager) { + Looper looper, AnimatorFactory animatorFactory, UEventManager uEventManager) { mContext = context; mNative = nativeService; - mDataStore = dataStore; mHandler = new Handler(looper, this::handleMessage); mAnimatorFactory = animatorFactory; mAmbientController = new AmbientKeyboardBacklightController(context, looper); @@ -141,6 +140,8 @@ final class KeyboardBacklightController implements Resources res = mContext.getResources(); mUserInactivityThresholdMs = res.getInteger( com.android.internal.R.integer.config_keyboardBacklightTimeoutMs); + mKeyboardBacklightAnimationEnabled = + InputProperties.enable_keyboard_backlight_animation().orElse(false); } @Override @@ -164,10 +165,8 @@ final class KeyboardBacklightController implements } }, UEVENT_KEYBOARD_BACKLIGHT_TAG); - if (InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled()) { - // Start ambient backlight controller - mAmbientController.systemRunning(); - } + // Start ambient backlight controller + mAmbientController.systemRunning(); } @Override @@ -229,9 +228,6 @@ final class KeyboardBacklightController implements // level through keyboard up/down button updateAmbientLightListener(); - maybeBackupBacklightBrightness(inputDevice, state.mLight, - state.mBrightnessValueForLevel[newBrightnessLevel]); - if (DEBUG) { Slog.d(TAG, "Changing state from " + state.mBrightnessLevel + " to " + newBrightnessLevel); @@ -248,47 +244,6 @@ final class KeyboardBacklightController implements } } - private void maybeBackupBacklightBrightness(InputDevice inputDevice, Light keyboardBacklight, - int brightnessValue) { - // Don't back up or restore when ALS based keyboard backlight is enabled - if (InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled()) { - return; - } - synchronized (mDataStore) { - try { - mDataStore.setKeyboardBacklightBrightness(inputDevice.getDescriptor(), - keyboardBacklight.getId(), - brightnessValue); - } finally { - mDataStore.saveIfNeeded(); - } - } - } - - private void maybeRestoreBacklightBrightness(InputDevice inputDevice, Light keyboardBacklight) { - // Don't back up or restore when ALS based keyboard backlight is enabled - if (InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled()) { - return; - } - KeyboardBacklightState state = mKeyboardBacklights.get(inputDevice.getId()); - OptionalInt brightness; - synchronized (mDataStore) { - brightness = mDataStore.getKeyboardBacklightBrightness( - inputDevice.getDescriptor(), keyboardBacklight.getId()); - } - if (state != null && brightness.isPresent()) { - int brightnessValue = Math.max(0, Math.min(MAX_BRIGHTNESS, brightness.getAsInt())); - int newLevel = Arrays.binarySearch(state.mBrightnessValueForLevel, brightnessValue); - if (newLevel < 0) { - newLevel = Math.min(state.getNumBrightnessChangeSteps(), -(newLevel + 1)); - } - state.setBrightnessLevel(newLevel); - if (DEBUG) { - Slog.d(TAG, "Restoring brightness level " + brightness.getAsInt()); - } - } - } - private void handleUserActivity() { // Ignore user activity if device is not interactive. When device becomes interactive, we // will send another user activity to turn backlight on. @@ -393,7 +348,6 @@ final class KeyboardBacklightController implements } // The keyboard backlight was added or changed. mKeyboardBacklights.put(deviceId, new KeyboardBacklightState(deviceId, keyboardBacklight)); - maybeRestoreBacklightBrightness(inputDevice, keyboardBacklight); } private InputDevice getInputDevice(int deviceId) { @@ -472,9 +426,6 @@ final class KeyboardBacklightController implements } private void updateAmbientLightListener() { - if (!InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled()) { - return; - } boolean needToListenAmbientLightSensor = false; for (int i = 0; i < mKeyboardBacklights.size(); i++) { needToListenAmbientLightSensor |= mKeyboardBacklights.valueAt(i).mUseAmbientController; @@ -555,8 +506,7 @@ final class KeyboardBacklightController implements private int mBrightnessLevel; private ValueAnimator mAnimator; private final int[] mBrightnessValueForLevel; - private boolean mUseAmbientController = - InputFeatureFlagProvider.isAmbientKeyboardBacklightControlEnabled(); + private boolean mUseAmbientController = true; KeyboardBacklightState(int deviceId, Light light) { mDeviceId = deviceId; @@ -565,9 +515,6 @@ final class KeyboardBacklightController implements } private int[] setupBrightnessLevels() { - if (!InputFeatureFlagProvider.isKeyboardBacklightCustomLevelsEnabled()) { - return DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL; - } int[] customLevels = mLight.getPreferredBrightnessLevels(); if (customLevels == null || customLevels.length == 0) { return DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL; @@ -627,7 +574,7 @@ final class KeyboardBacklightController implements if (fromValue == toValue) { return; } - if (InputFeatureFlagProvider.isKeyboardBacklightAnimationEnabled()) { + if (mKeyboardBacklightAnimationEnabled) { startAnimation(fromValue, toValue); } else { mNative.setLightColor(mDeviceId, mLight.getId(), Color.argb(toValue, 0, 0, 0)); diff --git a/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java b/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java index a132876b72a3..0914b7e3eeb2 100644 --- a/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java +++ b/services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java @@ -93,29 +93,6 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { mContext = context; mPackageManagerInternal = packageManagerInternal; mHandler = handler; - - IntentFilter integrityVerificationFilter = new IntentFilter(); - integrityVerificationFilter.addAction(ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION); - try { - integrityVerificationFilter.addDataType(PACKAGE_MIME_TYPE); - } catch (IntentFilter.MalformedMimeTypeException e) { - throw new RuntimeException("Mime type malformed: should never happen.", e); - } - - mContext.registerReceiver( - new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - if (!ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION.equals( - intent.getAction())) { - return; - } - mHandler.post(() -> handleIntegrityVerification(intent)); - } - }, - integrityVerificationFilter, - /* broadcastPermission= */ null, - mHandler); } @Override @@ -157,10 +134,4 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub { public List<String> getWhitelistedRuleProviders() { return Collections.emptyList(); } - - private void handleIntegrityVerification(Intent intent) { - int verificationId = intent.getIntExtra(EXTRA_VERIFICATION_ID, -1); - mPackageManagerInternal.setIntegrityVerificationResult( - verificationId, PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW); - } } diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java b/services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java index 53389cafecef..aa215ce8057f 100644 --- a/services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java +++ b/services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java @@ -24,6 +24,11 @@ import android.hardware.contexthub.HubServiceInfo; import android.hardware.contexthub.IContextHubEndpoint; import android.hardware.contexthub.IContextHubEndpointCallback; import android.hardware.location.IContextHubTransactionCallback; +import android.os.IBinder; +import android.os.RemoteException; +import android.util.Log; + +import java.util.concurrent.atomic.AtomicBoolean; /** * A class that represents a broker for the endpoint registered by the client app. This class @@ -31,7 +36,8 @@ import android.hardware.location.IContextHubTransactionCallback; * * @hide */ -public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub { +public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub + implements IBinder.DeathRecipient { private static final String TAG = "ContextHubEndpointBroker"; /** The context of the service. */ @@ -52,6 +58,9 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub { /** The remote callback interface for this endpoint. */ private final IContextHubEndpointCallback mContextHubEndpointCallback; + /** True if this endpoint is registered with the service. */ + private AtomicBoolean mIsRegistered = new AtomicBoolean(true); + /* package */ ContextHubEndpointBroker( Context context, IContextHubWrapper contextHubProxy, @@ -72,27 +81,55 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub { } @Override - public int openSession(HubEndpointInfo destination, HubServiceInfo serviceInfo) { - // TODO(b/378487799): Implement this - return 0; + public int openSession(HubEndpointInfo destination, HubServiceInfo serviceInfo) + throws RemoteException { + ContextHubServiceUtil.checkPermissions(mContext); + if (!mIsRegistered.get()) throw new IllegalStateException("Endpoint is not registered"); + int sessionId = mEndpointManager.reserveSessionId(); + EndpointInfo halEndpointInfo = ContextHubServiceUtil.convertHalEndpointInfo(destination); + try { + mContextHubProxy.openEndpointSession( + sessionId, + halEndpointInfo.id, + mHalEndpointInfo.id, + serviceInfo == null ? null : serviceInfo.getServiceDescriptor()); + } catch (RemoteException | IllegalArgumentException | UnsupportedOperationException e) { + Log.e(TAG, "Exception while calling HAL openEndpointSession", e); + mEndpointManager.returnSessionId(sessionId); + throw e; + } + + return sessionId; } @Override - public void closeSession(int sessionId, int reason) { - // TODO(b/378487799): Implement this - + public void closeSession(int sessionId, int reason) throws RemoteException { + ContextHubServiceUtil.checkPermissions(mContext); + if (!mIsRegistered.get()) throw new IllegalStateException("Endpoint is not registered"); + try { + mContextHubProxy.closeEndpointSession(sessionId, (byte) reason); + } catch (RemoteException | IllegalArgumentException | UnsupportedOperationException e) { + Log.e(TAG, "Exception while calling HAL closeEndpointSession", e); + throw e; + } } @Override public void openSessionRequestComplete(int sessionId) { // TODO(b/378487799): Implement this - } @Override public void unregister() { - // TODO(b/378487799): Implement this - + ContextHubServiceUtil.checkPermissions(mContext); + mIsRegistered.set(false); + try { + mContextHubProxy.unregisterEndpoint(mHalEndpointInfo); + } catch (RemoteException e) { + Log.e(TAG, "RemoteException while calling HAL unregisterEndpoint", e); + } + // TODO(b/378487799): Release reserved session IDs + mEndpointManager.unregisterEndpoint(mEndpointInfo.getIdentifier().getEndpoint()); } @Override @@ -105,4 +142,16 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub { public void sendMessageDeliveryStatus(int sessionId, int messageSeqNumber, byte errorCode) { // TODO(b/381102453): Implement this } + + /** Invoked when the underlying binder of this broker has died at the client process. */ + @Override + public void binderDied() { + unregister(); + } + + /* package */ void attachDeathRecipient() throws RemoteException { + if (mContextHubEndpointCallback != null) { + mContextHubEndpointCallback.asBinder().linkToDeath(this, 0 /* flags */); + } + } } diff --git a/services/core/java/com/android/server/location/contexthub/ContextHubEndpointManager.java b/services/core/java/com/android/server/location/contexthub/ContextHubEndpointManager.java index 54ce74f7b2f1..fb64f99e5904 100644 --- a/services/core/java/com/android/server/location/contexthub/ContextHubEndpointManager.java +++ b/services/core/java/com/android/server/location/contexthub/ContextHubEndpointManager.java @@ -22,11 +22,15 @@ import android.hardware.contexthub.HubEndpointInfo; import android.hardware.contexthub.IContextHubEndpoint; import android.hardware.contexthub.IContextHubEndpointCallback; import android.os.RemoteException; +import android.os.ServiceSpecificException; import android.util.Log; import com.android.internal.annotations.GuardedBy; +import java.util.Collections; +import java.util.HashMap; import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; /** @@ -40,6 +44,12 @@ import java.util.concurrent.ConcurrentHashMap; /** The hub ID of the Context Hub Service. */ private static final long SERVICE_HUB_ID = 0x416e64726f696400L; + /** The range of session IDs to use for endpoints */ + private static final int SERVICE_SESSION_RANGE = 1024; + + /** The length of the array that should be returned by HAL requestSessionIdRange */ + private static final int SERVICE_SESSION_RANGE_LENGTH = 2; + /** The context of the service. */ private final Context mContext; @@ -55,9 +65,57 @@ import java.util.concurrent.ConcurrentHashMap; @GuardedBy("mEndpointLock") private long mNextEndpointId = 0; + /** The minimum session ID reservable by endpoints (retrieved from HAL) */ + private final int mMinSessionId; + + /** The minimum session ID reservable by endpoints (retrieved from HAL) */ + private final int mMaxSessionId; + + /** Variables for managing session ID creation */ + private final Object mSessionIdLock = new Object(); + + /** A set of session IDs that have been reserved by an endpoint. */ + @GuardedBy("mSessionIdLock") + private final Set<Integer> mReservedSessionIds = + Collections.newSetFromMap(new HashMap<Integer, Boolean>()); + + @GuardedBy("mSessionIdLock") + private int mNextSessionId = 0; + + /** Initialized to true if all initialization in the constructor succeeds. */ + private final boolean mSessionIdsValid; + /* package */ ContextHubEndpointManager(Context context, IContextHubWrapper contextHubProxy) { mContext = context; mContextHubProxy = contextHubProxy; + int[] range = null; + try { + range = mContextHubProxy.requestSessionIdRange(SERVICE_SESSION_RANGE); + if (range != null && range.length < SERVICE_SESSION_RANGE_LENGTH) { + Log.e(TAG, "Invalid session ID range: range array size = " + range.length); + range = null; + } + } catch (RemoteException | IllegalArgumentException | ServiceSpecificException e) { + Log.e(TAG, "Exception while calling HAL requestSessionIdRange", e); + } + + if (range == null) { + mMinSessionId = -1; + mMaxSessionId = -1; + mSessionIdsValid = false; + } else { + mMinSessionId = range[0]; + mMaxSessionId = range[1]; + if (!isSessionIdRangeValid(mMinSessionId, mMaxSessionId)) { + Log.e( + TAG, + "Invalid session ID range: max=" + mMaxSessionId + " min=" + mMinSessionId); + mSessionIdsValid = false; + } else { + mNextSessionId = mMinSessionId; + mSessionIdsValid = true; + } + } } /** @@ -71,6 +129,9 @@ import java.util.concurrent.ConcurrentHashMap; /* package */ IContextHubEndpoint registerEndpoint( HubEndpointInfo pendingEndpointInfo, IContextHubEndpointCallback callback) throws RemoteException { + if (!mSessionIdsValid) { + throw new IllegalStateException("ContextHubEndpointManager failed to initialize"); + } ContextHubEndpointBroker broker; long endpointId = getNewEndpointId(); EndpointInfo halEndpointInfo = @@ -91,15 +152,65 @@ import java.util.concurrent.ConcurrentHashMap; callback); mEndpointMap.put(endpointId, broker); - // TODO(b/378487799): Add death recipient + try { + broker.attachDeathRecipient(); + } catch (RemoteException e) { + // The client process has died, so we close the connection and return null + Log.e(TAG, "Failed to attach death recipient to client", e); + broker.unregister(); + return null; + } Log.d(TAG, "Registered endpoint with ID = " + endpointId); return IContextHubEndpoint.Stub.asInterface(broker); } /** - * @return an available endpoint ID + * Reserves an available session ID for an endpoint. + * + * @throws IllegalStateException if no session ID was available. + * @return The reserved session ID. */ + /* package */ int reserveSessionId() { + int id = -1; + synchronized (mSessionIdLock) { + final int maxCapacity = mMaxSessionId - mMinSessionId + 1; + if (mReservedSessionIds.size() >= maxCapacity) { + throw new IllegalStateException("Too many sessions reserved"); + } + + id = mNextSessionId; + for (int i = mMinSessionId; i <= mMaxSessionId; i++) { + if (!mReservedSessionIds.contains(id)) { + mNextSessionId = (id == mMaxSessionId) ? mMinSessionId : id + 1; + break; + } + + id = (id == mMaxSessionId) ? mMinSessionId : id + 1; + } + + mReservedSessionIds.add(id); + } + return id; + } + + /** Returns a previously reserved session ID through {@link #reserveSessionId()}. */ + /* package */ void returnSessionId(int sessionId) { + synchronized (mSessionIdLock) { + mReservedSessionIds.remove(sessionId); + } + } + + /** + * Unregisters an endpoint given its ID. + * + * @param endpointId The ID of the endpoint to unregister. + */ + /* package */ void unregisterEndpoint(long endpointId) { + mEndpointMap.remove(endpointId); + } + + /** @return an available endpoint ID */ private long getNewEndpointId() { synchronized (mEndpointLock) { if (mNextEndpointId == Long.MAX_VALUE) { @@ -108,4 +219,8 @@ import java.util.concurrent.ConcurrentHashMap; return mNextEndpointId++; } } + + private boolean isSessionIdRangeValid(int minId, int maxId) { + return (minId <= maxId) && (minId >= 0) && (maxId >= 0); + } } diff --git a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java index 14d75b02d6b0..c79dc84ec2af 100644 --- a/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java +++ b/services/core/java/com/android/server/location/contexthub/IContextHubWrapper.java @@ -18,6 +18,7 @@ package com.android.server.location.contexthub; import android.annotation.NonNull; import android.annotation.Nullable; import android.chre.flags.Flags; +import android.hardware.contexthub.EndpointId; import android.hardware.contexthub.HostEndpointInfo; import android.hardware.contexthub.HubEndpointInfo; import android.hardware.contexthub.MessageDeliveryStatus; @@ -243,6 +244,23 @@ public abstract class IContextHubWrapper { public void registerEndpoint(android.hardware.contexthub.EndpointInfo info) throws RemoteException {} + /** Unregisters a previously registered endpoint */ + public int[] requestSessionIdRange(int size) throws RemoteException { + return null; + } + + /** Opens an endpoint session between two endpoints */ + public void openEndpointSession( + int sessionId, EndpointId destination, EndpointId initiator, String serviceDescriptor) + throws RemoteException {} + + /** Closes a previously opened endpoint */ + public void closeEndpointSession(int sessionId, byte reason) throws RemoteException {} + + /** Unregisters a previously registered endpoint */ + public void unregisterEndpoint(android.hardware.contexthub.EndpointInfo info) + throws RemoteException {} + /** * @return True if this version of the Contexthub HAL supports Location setting notifications. */ @@ -685,6 +703,48 @@ public abstract class IContextHubWrapper { hub.registerEndpoint(info); } + @Override + public int[] requestSessionIdRange(int size) throws RemoteException { + android.hardware.contexthub.IContextHub hub = getHub(); + if (hub == null) { + return null; + } + return hub.requestSessionIdRange(size); + } + + @Override + public void openEndpointSession( + int sessionId, + EndpointId destination, + EndpointId initiator, + String serviceDescriptor) + throws RemoteException { + android.hardware.contexthub.IContextHub hub = getHub(); + if (hub == null) { + return; + } + hub.openEndpointSession(sessionId, destination, initiator, serviceDescriptor); + } + + @Override + public void closeEndpointSession(int sessionId, byte reason) throws RemoteException { + android.hardware.contexthub.IContextHub hub = getHub(); + if (hub == null) { + return; + } + hub.closeEndpointSession(sessionId, reason); + } + + @Override + public void unregisterEndpoint(android.hardware.contexthub.EndpointInfo info) + throws RemoteException { + android.hardware.contexthub.IContextHub hub = getHub(); + if (hub == null) { + return; + } + hub.unregisterEndpoint(info); + } + public boolean supportsLocationSettingNotifications() { return true; } diff --git a/services/core/java/com/android/server/location/fudger/LocationFudgerCache.java b/services/core/java/com/android/server/location/fudger/LocationFudgerCache.java index 3670c1f5c51b..ce8bec8f0147 100644 --- a/services/core/java/com/android/server/location/fudger/LocationFudgerCache.java +++ b/services/core/java/com/android/server/location/fudger/LocationFudgerCache.java @@ -180,7 +180,8 @@ public class LocationFudgerCache { Log.e(sTAG, "could not get population density"); } }; - mPopulationDensityProvider.getCoarsenedS2Cell(latitude, longitude, callback); + mPopulationDensityProvider.getCoarsenedS2Cells(latitude, longitude, MAX_CACHE_SIZE - 1, + callback); } /** diff --git a/services/core/java/com/android/server/location/provider/proxy/ProxyPopulationDensityProvider.java b/services/core/java/com/android/server/location/provider/proxy/ProxyPopulationDensityProvider.java index b0a0f0b0c83b..7b454e481dda 100644 --- a/services/core/java/com/android/server/location/provider/proxy/ProxyPopulationDensityProvider.java +++ b/services/core/java/com/android/server/location/provider/proxy/ProxyPopulationDensityProvider.java @@ -96,14 +96,15 @@ public class ProxyPopulationDensityProvider { /** Gets the population density at the requested location. */ - public void getCoarsenedS2Cell(double latitudeDegrees, double longitudeDegrees, - IS2CellIdsCallback callback) { + public void getCoarsenedS2Cells(double latitudeDegrees, double longitudeDegrees, + int numAdditionalCells, IS2CellIdsCallback callback) { mServiceWatcher.runOnBinder( new ServiceWatcher.BinderOperation() { @Override public void run(IBinder binder) throws RemoteException { IPopulationDensityProvider.Stub.asInterface(binder) - .getCoarsenedS2Cell(latitudeDegrees, longitudeDegrees, callback); + .getCoarsenedS2Cells(latitudeDegrees, longitudeDegrees, + numAdditionalCells, callback); } @Override diff --git a/services/core/java/com/android/server/media/quality/MediaQualityService.java b/services/core/java/com/android/server/media/quality/MediaQualityService.java index 65d0ab337400..849751b99aae 100644 --- a/services/core/java/com/android/server/media/quality/MediaQualityService.java +++ b/services/core/java/com/android/server/media/quality/MediaQualityService.java @@ -30,11 +30,15 @@ import android.media.quality.ParamCapability; import android.media.quality.PictureProfile; import android.media.quality.PictureProfileHandle; import android.media.quality.SoundProfile; +import android.media.quality.SoundProfileHandle; import android.os.PersistableBundle; import android.util.Log; import com.android.server.SystemService; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; + import org.json.JSONException; import org.json.JSONObject; @@ -42,6 +46,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -54,10 +59,14 @@ public class MediaQualityService extends SystemService { private static final String TAG = "MediaQualityService"; private final Context mContext; private final MediaQualityDbHelper mMediaQualityDbHelper; + private final BiMap<Long, String> mPictureProfileTempIdMap; + private final BiMap<Long, String> mSoundProfileTempIdMap; public MediaQualityService(Context context) { super(context); mContext = context; + mPictureProfileTempIdMap = HashBiMap.create(); + mSoundProfileTempIdMap = HashBiMap.create(); mMediaQualityDbHelper = new MediaQualityDbHelper(mContext); mMediaQualityDbHelper.setWriteAheadLoggingEnabled(true); mMediaQualityDbHelper.setIdleConnectionTimeout(30); @@ -80,11 +89,14 @@ public class MediaQualityService extends SystemService { values.put(BaseParameters.PARAMETER_NAME, pp.getName()); values.put(BaseParameters.PARAMETER_PACKAGE, pp.getPackageName()); values.put(BaseParameters.PARAMETER_INPUT_ID, pp.getInputId()); - values.put(mMediaQualityDbHelper.SETTINGS, bundleToJson(pp.getParameters())); + values.put(mMediaQualityDbHelper.SETTINGS, persistableBundleToJson(pp.getParameters())); // id is auto-generated by SQLite upon successful insertion of row - long id = db.insert(mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME, null, values); - return new PictureProfile.Builder(pp).setProfileId(Long.toString(id)).build(); + Long id = db.insert(mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME, + null, values); + populateTempIdMap(mPictureProfileTempIdMap, id); + pp.setProfileId(mPictureProfileTempIdMap.get(id)); + return pp; } @Override @@ -94,26 +106,27 @@ public class MediaQualityService extends SystemService { @Override public void removePictureProfile(String id, int userId) { - // TODO: implement + Long intId = mPictureProfileTempIdMap.inverse().get(id); + if (intId != null) { + SQLiteDatabase db = mMediaQualityDbHelper.getWritableDatabase(); + String selection = BaseParameters.PARAMETER_ID + " = ?"; + String[] selectionArgs = {Long.toString(intId)}; + db.delete(mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME, selection, + selectionArgs); + mPictureProfileTempIdMap.remove(intId); + } } @Override public PictureProfile getPictureProfile(int type, String name, int userId) { - SQLiteDatabase db = mMediaQualityDbHelper.getReadableDatabase(); - String selection = BaseParameters.PARAMETER_TYPE + " = ? AND " + BaseParameters.PARAMETER_NAME + " = ?"; String[] selectionArguments = {Integer.toString(type), name}; try ( - Cursor cursor = db.query( + Cursor cursor = getCursorAfterQuerying( mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME, - getAllPictureProfileColumns(), - selection, - selectionArguments, - /*groupBy=*/ null, - /*having=*/ null, - /*orderBy=*/ null) + getAllMediaProfileColumns(), selection, selectionArguments) ) { int count = cursor.getCount(); if (count == 0) { @@ -122,93 +135,19 @@ public class MediaQualityService extends SystemService { if (count > 1) { Log.wtf(TAG, String.format(Locale.US, "%d entries found for type=%d and name=%s" + " in %s. Should only ever be 0 or 1.", count, type, name, - mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME)); + mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME)); return null; } cursor.moveToFirst(); - return getPictureProfileFromCursor(cursor); - } - } - - private String bundleToJson(PersistableBundle bundle) { - JSONObject jsonObject = new JSONObject(); - if (bundle == null) { - return jsonObject.toString(); - } - for (String key : bundle.keySet()) { - try { - jsonObject.put(key, bundle.getString(key)); - } catch (JSONException e) { - Log.e(TAG, "Unable to serialize ", e); - } - } - return jsonObject.toString(); - } - - private PersistableBundle jsonToBundle(String jsonString) { - JSONObject jsonObject = null; - PersistableBundle bundle = new PersistableBundle(); - - try { - jsonObject = new JSONObject(jsonString); - - Iterator<String> keys = jsonObject.keys(); - while (keys.hasNext()) { - String key = keys.next(); - Object value = jsonObject.get(key); - - if (value instanceof String) { - bundle.putString(key, (String) value); - } else if (value instanceof Integer) { - bundle.putInt(key, (Integer) value); - } else if (value instanceof Boolean) { - bundle.putBoolean(key, (Boolean) value); - } else if (value instanceof Double) { - bundle.putDouble(key, (Double) value); - } else if (value instanceof Long) { - bundle.putLong(key, (Long) value); - } - } - } catch (JSONException e) { - throw new RuntimeException(e); + return getPictureProfileWithTempIdFromCursor(cursor); } - - return bundle; - } - - private String[] getAllPictureProfileColumns() { - return new String[]{ - BaseParameters.PARAMETER_ID, - BaseParameters.PARAMETER_TYPE, - BaseParameters.PARAMETER_NAME, - BaseParameters.PARAMETER_INPUT_ID, - BaseParameters.PARAMETER_PACKAGE, - mMediaQualityDbHelper.SETTINGS - }; - } - - private PictureProfile getPictureProfileFromCursor(Cursor cursor) { - String returnId = cursor.getString(cursor.getColumnIndexOrThrow( - BaseParameters.PARAMETER_ID)); - int type = cursor.getInt(cursor.getColumnIndexOrThrow( - BaseParameters.PARAMETER_TYPE)); - String name = cursor.getString(cursor.getColumnIndexOrThrow( - BaseParameters.PARAMETER_NAME)); - String inputId = cursor.getString(cursor.getColumnIndexOrThrow( - BaseParameters.PARAMETER_INPUT_ID)); - String packageName = cursor.getString(cursor.getColumnIndexOrThrow( - BaseParameters.PARAMETER_PACKAGE)); - String settings = cursor.getString( - cursor.getColumnIndexOrThrow(mMediaQualityDbHelper.SETTINGS)); - return new PictureProfile(returnId, type, name, inputId, - packageName, jsonToBundle(settings)); } @Override public List<PictureProfile> getPictureProfilesByPackage(String packageName, int userId) { String selection = BaseParameters.PARAMETER_PACKAGE + " = ?"; String[] selectionArguments = {packageName}; - return getPictureProfilesBasedOnConditions(getAllPictureProfileColumns(), selection, + return getPictureProfilesBasedOnConditions(getAllMediaProfileColumns(), selection, selectionArguments); } @@ -218,40 +157,30 @@ public class MediaQualityService extends SystemService { } @Override + public boolean setDefaultPictureProfile(String profileId, int userId) { + // TODO: pass the profile ID to MediaQuality HAL when ready. + return false; + } + + @Override public List<String> getPictureProfilePackageNames(int userId) { - String [] column = {BaseParameters.PARAMETER_NAME}; + String [] column = {BaseParameters.PARAMETER_PACKAGE}; List<PictureProfile> pictureProfiles = getPictureProfilesBasedOnConditions(column, null, null); return pictureProfiles.stream() - .map(PictureProfile::getName) + .map(PictureProfile::getPackageName) + .distinct() .collect(Collectors.toList()); } - private List<PictureProfile> getPictureProfilesBasedOnConditions(String[] columns, - String selection, String[] selectionArguments) { - SQLiteDatabase db = mMediaQualityDbHelper.getReadableDatabase(); - - try ( - Cursor cursor = db.query( - mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME, - columns, - selection, - selectionArguments, - /*groupBy=*/ null, - /*having=*/ null, - /*orderBy=*/ null) - ) { - List<PictureProfile> pictureProfiles = new ArrayList<>(); - while (cursor.moveToNext()) { - pictureProfiles.add(getPictureProfileFromCursor(cursor)); - } - return pictureProfiles; - } + @Override + public List<PictureProfileHandle> getPictureProfileHandle(String[] id, int userId) { + return new ArrayList<>(); } @Override - public PictureProfileHandle getPictureProfileHandle(String id, int userId) { - return null; + public List<SoundProfileHandle> getSoundProfileHandle(String[] id, int userId) { + return new ArrayList<>(); } @Override @@ -259,13 +188,18 @@ public class MediaQualityService extends SystemService { SQLiteDatabase db = mMediaQualityDbHelper.getWritableDatabase(); ContentValues values = new ContentValues(); + values.put(BaseParameters.PARAMETER_TYPE, sp.getProfileType()); values.put(BaseParameters.PARAMETER_NAME, sp.getName()); values.put(BaseParameters.PARAMETER_PACKAGE, sp.getPackageName()); values.put(BaseParameters.PARAMETER_INPUT_ID, sp.getInputId()); - values.put(mMediaQualityDbHelper.SETTINGS, bundleToJson(sp.getParameters())); + values.put(mMediaQualityDbHelper.SETTINGS, persistableBundleToJson(sp.getParameters())); - long id = db.insert(mMediaQualityDbHelper.SOUND_QUALITY_TABLE_NAME, null, values); - return new SoundProfile.Builder(sp).setProfileId(Long.toString(id)).build(); + // id is auto-generated by SQLite upon successful insertion of row + Long id = db.insert(mMediaQualityDbHelper.SOUND_QUALITY_TABLE_NAME, + null, values); + populateTempIdMap(mSoundProfileTempIdMap, id); + sp.setProfileId(mSoundProfileTempIdMap.get(id)); + return sp; } @Override @@ -275,28 +209,27 @@ public class MediaQualityService extends SystemService { @Override public void removeSoundProfile(String id, int userId) { - SQLiteDatabase db = mMediaQualityDbHelper.getWritableDatabase(); - String selection = BaseParameters.PARAMETER_ID + " = ?"; - String[] selectionArgs = {id}; - db.delete(mMediaQualityDbHelper.SOUND_QUALITY_TABLE_NAME, selection, selectionArgs); + Long intId = mSoundProfileTempIdMap.inverse().get(id); + if (intId != null) { + SQLiteDatabase db = mMediaQualityDbHelper.getWritableDatabase(); + String selection = BaseParameters.PARAMETER_ID + " = ?"; + String[] selectionArgs = {Long.toString(intId)}; + db.delete(mMediaQualityDbHelper.SOUND_QUALITY_TABLE_NAME, selection, + selectionArgs); + mSoundProfileTempIdMap.remove(intId); + } } @Override public SoundProfile getSoundProfile(int type, String id, int userId) { - SQLiteDatabase db = mMediaQualityDbHelper.getReadableDatabase(); - - String selection = BaseParameters.PARAMETER_ID + " = ?"; - String[] selectionArguments = {id}; + String selection = BaseParameters.PARAMETER_TYPE + " = ? AND " + + BaseParameters.PARAMETER_NAME + " = ?"; + String[] selectionArguments = {String.valueOf(type), id}; try ( - Cursor cursor = db.query( + Cursor cursor = getCursorAfterQuerying( mMediaQualityDbHelper.SOUND_QUALITY_TABLE_NAME, - getAllSoundProfileColumns(), - selection, - selectionArguments, - /*groupBy=*/ null, - /*having=*/ null, - /*orderBy=*/ null) + getAllMediaProfileColumns(), selection, selectionArguments) ) { int count = cursor.getCount(); if (count == 0) { @@ -309,7 +242,7 @@ public class MediaQualityService extends SystemService { return null; } cursor.moveToFirst(); - return getSoundProfileFromCursor(cursor); + return getSoundProfileWithTempIdFromCursor(cursor); } } @@ -317,7 +250,7 @@ public class MediaQualityService extends SystemService { public List<SoundProfile> getSoundProfilesByPackage(String packageName, int userId) { String selection = BaseParameters.PARAMETER_PACKAGE + " = ?"; String[] selectionArguments = {packageName}; - return getSoundProfilesBasedOnConditions(getAllSoundProfileColumns(), selection, + return getSoundProfilesBasedOnConditions(getAllMediaProfileColumns(), selection, selectionArguments); } @@ -327,18 +260,90 @@ public class MediaQualityService extends SystemService { } @Override + public boolean setDefaultSoundProfile(String profileId, int userId) { + // TODO: pass the profile ID to MediaQuality HAL when ready. + return false; + } + + @Override public List<String> getSoundProfilePackageNames(int userId) { String [] column = {BaseParameters.PARAMETER_NAME}; List<SoundProfile> soundProfiles = getSoundProfilesBasedOnConditions(column, null, null); return soundProfiles.stream() - .map(SoundProfile::getName) + .map(SoundProfile::getPackageName) + .distinct() .collect(Collectors.toList()); } - private String[] getAllSoundProfileColumns() { + private void populateTempIdMap(BiMap<Long, String> map, Long id) { + if (id != null && map.get(id) == null) { + String uuid = UUID.randomUUID().toString(); + while (map.inverse().containsKey(uuid)) { + uuid = UUID.randomUUID().toString(); + } + map.put(id, uuid); + } + } + + private String persistableBundleToJson(PersistableBundle bundle) { + JSONObject json = new JSONObject(); + for (String key : bundle.keySet()) { + Object value = bundle.get(key); + try { + if (value instanceof String) { + json.put(key, bundle.getString(key)); + } else if (value instanceof Integer) { + json.put(key, bundle.getInt(key)); + } else if (value instanceof Long) { + json.put(key, bundle.getLong(key)); + } else if (value instanceof Boolean) { + json.put(key, bundle.getBoolean(key)); + } else if (value instanceof Double) { + json.put(key, bundle.getDouble(key)); + } + } catch (JSONException e) { + Log.e(TAG, "Unable to serialize ", e); + } + } + return json.toString(); + } + + private PersistableBundle jsonToBundle(String jsonString) { + PersistableBundle bundle = new PersistableBundle(); + if (jsonString != null) { + JSONObject jsonObject = null; + try { + jsonObject = new JSONObject(jsonString); + + Iterator<String> keys = jsonObject.keys(); + while (keys.hasNext()) { + String key = keys.next(); + Object value = jsonObject.get(key); + + if (value instanceof String) { + bundle.putString(key, (String) value); + } else if (value instanceof Integer) { + bundle.putInt(key, (Integer) value); + } else if (value instanceof Boolean) { + bundle.putBoolean(key, (Boolean) value); + } else if (value instanceof Double) { + bundle.putDouble(key, (Double) value); + } else if (value instanceof Long) { + bundle.putLong(key, (Long) value); + } + } + } catch (JSONException e) { + throw new RuntimeException(e); + } + } + return bundle; + } + + private String[] getAllMediaProfileColumns() { return new String[]{ BaseParameters.PARAMETER_ID, + BaseParameters.PARAMETER_TYPE, BaseParameters.PARAMETER_NAME, BaseParameters.PARAMETER_INPUT_ID, BaseParameters.PARAMETER_PACKAGE, @@ -346,40 +351,94 @@ public class MediaQualityService extends SystemService { }; } - private SoundProfile getSoundProfileFromCursor(Cursor cursor) { - String returnId = cursor.getString( - cursor.getColumnIndexOrThrow(BaseParameters.PARAMETER_ID)); - int type = cursor.getInt( - cursor.getColumnIndexOrThrow(BaseParameters.PARAMETER_TYPE)); - String name = cursor.getString( - cursor.getColumnIndexOrThrow(BaseParameters.PARAMETER_NAME)); - String inputId = cursor.getString( - cursor.getColumnIndexOrThrow(BaseParameters.PARAMETER_INPUT_ID)); - String packageName = cursor.getString( - cursor.getColumnIndexOrThrow(BaseParameters.PARAMETER_PACKAGE)); - String settings = cursor.getString( - cursor.getColumnIndexOrThrow(mMediaQualityDbHelper.SETTINGS)); - return new SoundProfile(returnId, type, name, inputId, packageName, - jsonToBundle(settings)); + private PictureProfile getPictureProfileWithTempIdFromCursor(Cursor cursor) { + return new PictureProfile( + getTempId(mPictureProfileTempIdMap, cursor), + getType(cursor), + getName(cursor), + getInputId(cursor), + getPackageName(cursor), + jsonToBundle(getSettingsString(cursor)), + PictureProfileHandle.NONE + ); } - private List<SoundProfile> getSoundProfilesBasedOnConditions(String[] columns, - String selection, String[] selectionArguments) { + private SoundProfile getSoundProfileWithTempIdFromCursor(Cursor cursor) { + return new SoundProfile( + getTempId(mSoundProfileTempIdMap, cursor), + getType(cursor), + getName(cursor), + getInputId(cursor), + getPackageName(cursor), + jsonToBundle(getSettingsString(cursor)), + SoundProfileHandle.NONE + ); + } + + private String getTempId(BiMap<Long, String> map, Cursor cursor) { + int colIndex = cursor.getColumnIndex(BaseParameters.PARAMETER_ID); + Long dbId = colIndex != -1 ? cursor.getLong(colIndex) : null; + populateTempIdMap(map, dbId); + return map.get(dbId); + } + + private int getType(Cursor cursor) { + int colIndex = cursor.getColumnIndex(BaseParameters.PARAMETER_TYPE); + return colIndex != -1 ? cursor.getInt(colIndex) : 0; + } + + private String getName(Cursor cursor) { + int colIndex = cursor.getColumnIndex(BaseParameters.PARAMETER_NAME); + return colIndex != -1 ? cursor.getString(colIndex) : null; + } + + private String getInputId(Cursor cursor) { + int colIndex = cursor.getColumnIndex(BaseParameters.PARAMETER_INPUT_ID); + return colIndex != -1 ? cursor.getString(colIndex) : null; + } + + private String getPackageName(Cursor cursor) { + int colIndex = cursor.getColumnIndex(BaseParameters.PARAMETER_PACKAGE); + return colIndex != -1 ? cursor.getString(colIndex) : null; + } + + private String getSettingsString(Cursor cursor) { + int colIndex = cursor.getColumnIndex(mMediaQualityDbHelper.SETTINGS); + return colIndex != -1 ? cursor.getString(colIndex) : null; + } + + private Cursor getCursorAfterQuerying(String table, String[] columns, String selection, + String[] selectionArgs) { SQLiteDatabase db = mMediaQualityDbHelper.getReadableDatabase(); + return db.query(table, columns, selection, selectionArgs, + /*groupBy=*/ null, /*having=*/ null, /*orderBy=*/ null); + } + private List<PictureProfile> getPictureProfilesBasedOnConditions(String[] columns, + String selection, String[] selectionArguments) { try ( - Cursor cursor = db.query( - mMediaQualityDbHelper.SOUND_QUALITY_TABLE_NAME, - columns, - selection, - selectionArguments, - /*groupBy=*/ null, - /*having=*/ null, - /*orderBy=*/ null) + Cursor cursor = getCursorAfterQuerying( + mMediaQualityDbHelper.PICTURE_QUALITY_TABLE_NAME, columns, selection, + selectionArguments) + ) { + List<PictureProfile> pictureProfiles = new ArrayList<>(); + while (cursor.moveToNext()) { + pictureProfiles.add(getPictureProfileWithTempIdFromCursor(cursor)); + } + return pictureProfiles; + } + } + + private List<SoundProfile> getSoundProfilesBasedOnConditions(String[] columns, + String selection, String[] selectionArguments) { + try ( + Cursor cursor = getCursorAfterQuerying( + mMediaQualityDbHelper.SOUND_QUALITY_TABLE_NAME, columns, selection, + selectionArguments) ) { List<SoundProfile> soundProfiles = new ArrayList<>(); while (cursor.moveToNext()) { - soundProfiles.add(getSoundProfileFromCursor(cursor)); + soundProfiles.add(getSoundProfileWithTempIdFromCursor(cursor)); } return soundProfiles; } diff --git a/services/core/java/com/android/server/pm/InstallDependencyHelper.java b/services/core/java/com/android/server/pm/InstallDependencyHelper.java index 13aab11595d2..c0ddebeb9868 100644 --- a/services/core/java/com/android/server/pm/InstallDependencyHelper.java +++ b/services/core/java/com/android/server/pm/InstallDependencyHelper.java @@ -32,11 +32,13 @@ import android.content.pm.dependencyinstaller.DependencyInstallerCallback; import android.content.pm.dependencyinstaller.IDependencyInstallerCallback; import android.content.pm.dependencyinstaller.IDependencyInstallerService; import android.content.pm.parsing.PackageLite; +import android.os.Binder; import android.os.Handler; import android.os.OutcomeReceiver; import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; +import android.util.ArrayMap; import android.util.ArraySet; import android.util.Slog; @@ -63,12 +65,11 @@ public class InstallDependencyHelper { private final Context mContext; private final SharedLibrariesImpl mSharedLibraries; private final PackageInstallerService mPackageInstallerService; - private final Object mRemoteServiceLock = new Object(); @GuardedBy("mTrackers") private final List<DependencyInstallTracker> mTrackers = new ArrayList<>(); - - @GuardedBy("mRemoteServiceLock") - private ServiceConnector<IDependencyInstallerService> mRemoteService = null; + @GuardedBy("mRemoteServices") + private final ArrayMap<Integer, ServiceConnector<IDependencyInstallerService>> mRemoteServices = + new ArrayMap<>(); InstallDependencyHelper(Context context, SharedLibrariesImpl sharedLibraries, PackageInstallerService packageInstallerService) { @@ -97,13 +98,18 @@ public class InstallDependencyHelper { if (missing.isEmpty()) { if (DEBUG) { - Slog.d(TAG, "No missing dependency for " + pkg); + Slog.d(TAG, "No missing dependency for " + pkg.getPackageName()); } // No need for dependency resolution. Move to installation directly. callback.onResult(null); return; } + if (DEBUG) { + Slog.d(TAG, "Missing dependencies found for pkg: " + pkg.getPackageName() + + " user: " + userId); + } + if (!bindToDependencyInstallerIfNeeded(userId, handler, snapshot)) { onError(callback, "Dependency Installer Service not found"); return; @@ -112,8 +118,8 @@ public class InstallDependencyHelper { IDependencyInstallerCallback serviceCallback = new DependencyInstallerCallbackCallOnce(handler, callback, userId); boolean scheduleSuccess; - synchronized (mRemoteServiceLock) { - scheduleSuccess = mRemoteService.run(service -> { + synchronized (mRemoteServices) { + scheduleSuccess = mRemoteServices.get(userId).run(service -> { service.onDependenciesRequired(missing, new DependencyInstallerCallback(serviceCallback.asBinder())); }); @@ -123,14 +129,14 @@ public class InstallDependencyHelper { } } - void notifySessionComplete(int sessionId, boolean success) { + void notifySessionComplete(int sessionId) { if (DEBUG) { - Slog.d(TAG, "Session complete for " + sessionId + " result: " + success); + Slog.d(TAG, "Session complete for " + sessionId); } synchronized (mTrackers) { List<DependencyInstallTracker> completedTrackers = new ArrayList<>(); for (DependencyInstallTracker tracker: mTrackers) { - if (!tracker.onSessionComplete(sessionId, success)) { + if (!tracker.onSessionComplete(sessionId)) { completedTrackers.add(tracker); } } @@ -149,15 +155,17 @@ public class InstallDependencyHelper { private boolean bindToDependencyInstallerIfNeeded(int userId, Handler handler, Computer snapshot) { - synchronized (mRemoteServiceLock) { - if (mRemoteService != null) { + synchronized (mRemoteServices) { + if (mRemoteServices.containsKey(userId)) { if (DEBUG) { - Slog.i(TAG, "DependencyInstallerService already bound"); + Slog.i(TAG, "DependencyInstallerService for user " + userId + " already bound"); } return true; } } + Slog.i(TAG, "Attempting to bind to Dependency Installer Service for user " + userId); + RoleManager roleManager = mContext.getSystemService(RoleManager.class); if (roleManager == null) { Slog.w(TAG, "Cannot find RoleManager system service"); @@ -166,7 +174,7 @@ public class InstallDependencyHelper { List<String> holders = roleManager.getRoleHoldersAsUser( ROLE_SYSTEM_DEPENDENCY_INSTALLER, UserHandle.of(userId)); if (holders.isEmpty()) { - Slog.w(TAG, "No holders of ROLE_SYSTEM_DEPENDENCY_INSTALLER found"); + Slog.w(TAG, "No holders of ROLE_SYSTEM_DEPENDENCY_INSTALLER found for user " + userId); return false; } @@ -178,6 +186,8 @@ public class InstallDependencyHelper { /*includeInstantApps*/ false, /*resolveForStart*/ false); if (resolvedIntents.isEmpty()) { + Slog.w(TAG, "No package holding ROLE_SYSTEM_DEPENDENCY_INSTALLER found for user " + + userId); return false; } @@ -206,13 +216,14 @@ public class InstallDependencyHelper { }; - synchronized (mRemoteServiceLock) { + synchronized (mRemoteServices) { // Some other thread managed to connect to the service first - if (mRemoteService != null) { + if (mRemoteServices.containsKey(userId)) { return true; } - mRemoteService = serviceConnector; - mRemoteService.setServiceLifecycleCallbacks( + mRemoteServices.put(userId, serviceConnector); + // Block the lock until we connect to the service + serviceConnector.setServiceLifecycleCallbacks( new ServiceConnector.ServiceLifecycleCallbacks<>() { @Override public void onDisconnected(@NonNull IDependencyInstallerService service) { @@ -228,17 +239,18 @@ public class InstallDependencyHelper { } private void destroy() { - synchronized (mRemoteServiceLock) { - if (mRemoteService != null) { - mRemoteService.unbind(); - mRemoteService = null; + synchronized (mRemoteServices) { + if (mRemoteServices.containsKey(userId)) { + mRemoteServices.get(userId).unbind(); + mRemoteServices.remove(userId); } } } }); - AndroidFuture<IDependencyInstallerService> unusedFuture = mRemoteService.connect(); + AndroidFuture<IDependencyInstallerService> unusedFuture = serviceConnector.connect(); } + Slog.i(TAG, "Successfully bound to Dependency Installer Service for user " + userId); return true; } @@ -318,30 +330,40 @@ public class InstallDependencyHelper { Slog.d(TAG, "onAllDependenciesResolved started"); } - // Before creating any tracker, validate the arguments - ArraySet<Integer> validSessionIds = validateSessionIds(sessionIds); + try { + // Before creating any tracker, validate the arguments + ArraySet<Integer> validSessionIds = validateSessionIds(sessionIds); - if (validSessionIds.isEmpty()) { - mCallback.onResult(null); - return; - } + if (validSessionIds.isEmpty()) { + mCallback.onResult(null); + return; + } - // Create a tracker now if there are any pending sessions remaining. - DependencyInstallTracker tracker = new DependencyInstallTracker( - mCallback, validSessionIds); - synchronized (mTrackers) { - mTrackers.add(tracker); - } + // Create a tracker now if there are any pending sessions remaining. + DependencyInstallTracker tracker = new DependencyInstallTracker( + mCallback, validSessionIds); + synchronized (mTrackers) { + mTrackers.add(tracker); + } - // By the time the tracker was created, some of the sessions in validSessionIds - // could have finished. Avoid waiting for them indefinitely. - for (int sessionId : validSessionIds) { - SessionInfo sessionInfo = mPackageInstallerService.getSessionInfo(sessionId); + // By the time the tracker was created, some of the sessions in validSessionIds + // could have finished. Avoid waiting for them indefinitely. + for (int sessionId : validSessionIds) { + SessionInfo sessionInfo = mPackageInstallerService.getSessionInfo(sessionId); - // Don't wait for sessions that finished already - if (sessionInfo == null) { - notifySessionComplete(sessionId, /*success=*/ true); + // Don't wait for sessions that finished already + if (sessionInfo == null) { + Binder.withCleanCallingIdentity(() -> { + notifySessionComplete(sessionId); + }); + } + } + } catch (Exception e) { + // Allow calling the callback again + synchronized (this) { + mDependencyInstallerCallbackInvoked = false; } + throw e; } } @@ -354,7 +376,10 @@ public class InstallDependencyHelper { } mDependencyInstallerCallbackInvoked = true; } - onError(mCallback, "Failed to resolve all dependencies automatically"); + + Binder.withCleanCallingIdentity(() -> { + onError(mCallback, "Failed to resolve all dependencies automatically"); + }); } private ArraySet<Integer> validateSessionIds(int[] sessionIds) { @@ -369,7 +394,8 @@ public class InstallDependencyHelper { // Continue waiting if session exists and hasn't passed or failed yet. if (sessionInfo != null) { if (sessionInfo.isSessionFailed) { - throwValidationError("Session already finished: " + sessionId); + throw new IllegalArgumentException("Session already finished: " + + sessionId); } // Wait for session to finish install if it's not already successful. @@ -398,25 +424,17 @@ public class InstallDependencyHelper { s -> s.sessionId == sessionId).findFirst().orElse(null); if (sessionInfo == null) { - throwValidationError("Failed to find session: " + sessionId); + throw new IllegalArgumentException("Failed to find session: " + sessionId); } // Historical session must have been successful, otherwise throw IAE. if (!sessionInfo.isSessionApplied) { - throwValidationError("Session already finished: " + sessionId); + throw new IllegalArgumentException("Session already finished: " + sessionId); } } return validSessionIds; } - - private void throwValidationError(String msg) { - // Allow client to invoke callback again. - synchronized (this) { - mDependencyInstallerCallbackInvoked = false; - } - throw new IllegalArgumentException(msg); - } } /** @@ -441,19 +459,13 @@ public class InstallDependencyHelper { * * Returns true if we still need to continue tracking. */ - public boolean onSessionComplete(int sessionId, boolean success) { + public boolean onSessionComplete(int sessionId) { synchronized (this) { if (!mPendingSessionIds.contains(sessionId)) { // This had no impact on tracker, so continue tracking return true; } - if (!success) { - // If one of the dependency fails, the orig session would fail too. - onError(mCallback, "Failed to install all dependencies"); - return false; // No point in tracking anymore - } - mPendingSessionIds.remove(sessionId); if (mPendingSessionIds.isEmpty()) { mCallback.onResult(null); diff --git a/services/core/java/com/android/server/pm/PackageHandler.java b/services/core/java/com/android/server/pm/PackageHandler.java index 0a0882d80cc1..4ea405441030 100644 --- a/services/core/java/com/android/server/pm/PackageHandler.java +++ b/services/core/java/com/android/server/pm/PackageHandler.java @@ -18,7 +18,6 @@ package com.android.server.pm; import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; -import static com.android.server.pm.PackageManagerService.CHECK_PENDING_INTEGRITY_VERIFICATION; import static com.android.server.pm.PackageManagerService.CHECK_PENDING_VERIFICATION; import static com.android.server.pm.PackageManagerService.DEBUG_INSTALL; import static com.android.server.pm.PackageManagerService.DEFAULT_UNUSED_STATIC_SHARED_LIB_MIN_CACHE_PERIOD; @@ -29,7 +28,6 @@ import static com.android.server.pm.PackageManagerService.DOMAIN_VERIFICATION; import static com.android.server.pm.PackageManagerService.ENABLE_ROLLBACK_STATUS; import static com.android.server.pm.PackageManagerService.ENABLE_ROLLBACK_TIMEOUT; import static com.android.server.pm.PackageManagerService.INSTANT_APP_RESOLUTION_PHASE_TWO; -import static com.android.server.pm.PackageManagerService.INTEGRITY_VERIFICATION_COMPLETE; import static com.android.server.pm.PackageManagerService.PACKAGE_VERIFIED; import static com.android.server.pm.PackageManagerService.POST_INSTALL; import static com.android.server.pm.PackageManagerService.PRUNE_UNUSED_STATIC_SHARED_LIBRARIES; @@ -149,42 +147,6 @@ final class PackageHandler extends Handler { break; } - case CHECK_PENDING_INTEGRITY_VERIFICATION: { - final int verificationId = msg.arg1; - final PackageVerificationState state = mPm.mPendingVerification.get(verificationId); - - if (state != null && !state.isIntegrityVerificationComplete()) { - final VerifyingSession verifyingSession = state.getVerifyingSession(); - final Uri originUri = Uri.fromFile(verifyingSession.mOriginInfo.mResolvedFile); - - String errorMsg = "Integrity verification timed out for " + originUri; - Slog.i(TAG, errorMsg); - - state.setIntegrityVerificationResult( - getDefaultIntegrityVerificationResponse()); - - if (getDefaultIntegrityVerificationResponse() - == PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW) { - Slog.i(TAG, "Integrity check times out, continuing with " + originUri); - } else { - verifyingSession.setReturnCode( - PackageManager.INSTALL_FAILED_VERIFICATION_FAILURE, - errorMsg); - } - - if (state.areAllVerificationsComplete()) { - mPm.mPendingVerification.remove(verificationId); - } - - Trace.asyncTraceEnd( - TRACE_TAG_PACKAGE_MANAGER, - "integrity_verification", - verificationId); - - verifyingSession.handleIntegrityVerificationFinished(); - } - break; - } case PACKAGE_VERIFIED: { final int verificationId = msg.arg1; @@ -205,42 +167,6 @@ final class PackageHandler extends Handler { break; } - case INTEGRITY_VERIFICATION_COMPLETE: { - final int verificationId = msg.arg1; - - final PackageVerificationState state = mPm.mPendingVerification.get(verificationId); - if (state == null) { - Slog.w(TAG, "Integrity verification with id " + verificationId - + " not found. It may be invalid or overridden by verifier"); - break; - } - - final int response = (Integer) msg.obj; - final VerifyingSession verifyingSession = state.getVerifyingSession(); - final Uri originUri = Uri.fromFile(verifyingSession.mOriginInfo.mResolvedFile); - - state.setIntegrityVerificationResult(response); - - if (response == PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW) { - Slog.i(TAG, "Integrity check passed for " + originUri); - } else { - verifyingSession.setReturnCode( - PackageManager.INSTALL_FAILED_VERIFICATION_FAILURE, - "Integrity check failed for " + originUri); - } - - if (state.areAllVerificationsComplete()) { - mPm.mPendingVerification.remove(verificationId); - } - - Trace.asyncTraceEnd( - TRACE_TAG_PACKAGE_MANAGER, - "integrity_verification", - verificationId); - - verifyingSession.handleIntegrityVerificationFinished(); - break; - } case INSTANT_APP_RESOLUTION_PHASE_TWO: { InstantAppResolver.doInstantAppResolutionPhaseTwo(mPm.mContext, mPm.snapshotComputer(), diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java index 516b002885af..e1fcc6650650 100644 --- a/services/core/java/com/android/server/pm/PackageInstallerService.java +++ b/services/core/java/com/android/server/pm/PackageInstallerService.java @@ -2330,8 +2330,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements } if (Flags.sdkDependencyInstaller()) { - mInstallDependencyHelper.notifySessionComplete( - session.sessionId, success); + mInstallDependencyHelper.notifySessionComplete(session.sessionId); } final File appIconFile = buildAppIconFile(session.sessionId); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ab26f024a18a..340daf1f3d9a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -923,8 +923,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService static final int ENABLE_ROLLBACK_TIMEOUT = 22; static final int DEFERRED_NO_KILL_POST_DELETE = 23; static final int DEFERRED_NO_KILL_INSTALL_OBSERVER = 24; - static final int INTEGRITY_VERIFICATION_COMPLETE = 25; - static final int CHECK_PENDING_INTEGRITY_VERIFICATION = 26; + // static final int UNUSED = 25; + // static final int UNUSED = 26; static final int DOMAIN_VERIFICATION = 27; static final int PRUNE_UNUSED_STATIC_SHARED_LIBRARIES = 28; static final int DEFERRED_PENDING_KILL_INSTALL_OBSERVER = 29; @@ -3020,6 +3020,16 @@ public class PackageManagerService implements PackageSender, TestUtilityService mDexOptHelper.performPackageDexOptUpgradeIfNeeded(); } + public void updateMetricsIfNeeded() { + final DisplayManager displayManager = mContext.getSystemService(DisplayManager.class); + if (displayManager != null) { + final Display display = displayManager.getDisplay(Display.DEFAULT_DISPLAY); + if (display != null) { + display.getMetrics(mMetrics); + } + } + } + private void notifyPackageUseInternal(String packageName, int reason) { long time = System.currentTimeMillis(); synchronized (mLock) { @@ -7124,12 +7134,10 @@ public class PackageManagerService implements PackageSender, TestUtilityService return mSettings.isPermissionUpgradeNeeded(userId); } + @Deprecated @Override public void setIntegrityVerificationResult(int verificationId, int verificationResult) { - final Message msg = mHandler.obtainMessage(INTEGRITY_VERIFICATION_COMPLETE); - msg.arg1 = verificationId; - msg.obj = verificationResult; - mHandler.sendMessage(msg); + // Do nothing. } @Override diff --git a/services/core/java/com/android/server/pm/PackageVerificationState.java b/services/core/java/com/android/server/pm/PackageVerificationState.java index 0b6ccc41d956..63c2ee2e5454 100644 --- a/services/core/java/com/android/server/pm/PackageVerificationState.java +++ b/services/core/java/com/android/server/pm/PackageVerificationState.java @@ -43,8 +43,6 @@ class PackageVerificationState { private boolean mRequiredVerificationPassed; - private boolean mIntegrityVerificationComplete; - /** * Create a new package verification state where {@code requiredVerifierUid} is the user ID for * the package that must reply affirmative before things can continue. @@ -213,15 +211,7 @@ class PackageVerificationState { return mExtendedTimeoutUids.get(uid, false); } - void setIntegrityVerificationResult(int code) { - mIntegrityVerificationComplete = true; - } - - boolean isIntegrityVerificationComplete() { - return mIntegrityVerificationComplete; - } - boolean areAllVerificationsComplete() { - return mIntegrityVerificationComplete && isVerificationComplete(); + return isVerificationComplete(); } } diff --git a/services/core/java/com/android/server/pm/VerifyingSession.java b/services/core/java/com/android/server/pm/VerifyingSession.java index f7eb29fe3ee9..542ae8eb9207 100644 --- a/services/core/java/com/android/server/pm/VerifyingSession.java +++ b/services/core/java/com/android/server/pm/VerifyingSession.java @@ -28,7 +28,6 @@ import static android.os.PowerWhitelistManager.REASON_PACKAGE_VERIFIER; import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED; import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; -import static com.android.server.pm.PackageManagerService.CHECK_PENDING_INTEGRITY_VERIFICATION; import static com.android.server.pm.PackageManagerService.CHECK_PENDING_VERIFICATION; import static com.android.server.pm.PackageManagerService.DEBUG_INSTALL; import static com.android.server.pm.PackageManagerService.DEBUG_VERIFY; @@ -87,11 +86,6 @@ final class VerifyingSession { * Whether verification is enabled by default. */ private static final boolean DEFAULT_VERIFY_ENABLE = true; - - /** - * Whether integrity verification is enabled by default. - */ - private static final boolean DEFAULT_INTEGRITY_VERIFY_ENABLE = true; /** * The default maximum time to wait for the integrity verification to return in * milliseconds. @@ -129,7 +123,6 @@ final class VerifyingSession { private final boolean mUserActionRequired; private final int mUserActionRequiredType; private boolean mWaitForVerificationToComplete; - private boolean mWaitForIntegrityVerificationToComplete; private boolean mWaitForEnableRollbackToComplete; private int mRet = PackageManager.INSTALL_SUCCEEDED; private String mErrorMessage = null; @@ -217,7 +210,6 @@ final class VerifyingSession { new PackageVerificationState(this); mPm.mPendingVerification.append(verificationId, verificationState); - sendIntegrityVerificationRequest(verificationId, pkgLite, verificationState); sendPackageVerificationRequest( verificationId, pkgLite, verificationState); @@ -270,89 +262,6 @@ final class VerifyingSession { mPm.mHandler.sendMessageDelayed(msg, rollbackTimeout); } - /** - * Send a request to check the integrity of the package. - */ - void sendIntegrityVerificationRequest( - int verificationId, - PackageInfoLite pkgLite, - PackageVerificationState verificationState) { - if (!isIntegrityVerificationEnabled()) { - // Consider the integrity check as passed. - verificationState.setIntegrityVerificationResult( - PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW); - return; - } - - final Intent integrityVerification = - new Intent(Intent.ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION); - - integrityVerification.setDataAndType(Uri.fromFile(new File(mOriginInfo.mResolvedPath)), - PACKAGE_MIME_TYPE); - - final int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION - | Intent.FLAG_RECEIVER_REGISTERED_ONLY - | Intent.FLAG_RECEIVER_FOREGROUND; - integrityVerification.addFlags(flags); - - integrityVerification.putExtra(EXTRA_VERIFICATION_ID, verificationId); - integrityVerification.putExtra(EXTRA_PACKAGE_NAME, pkgLite.packageName); - integrityVerification.putExtra(EXTRA_VERSION_CODE, pkgLite.versionCode); - integrityVerification.putExtra(EXTRA_LONG_VERSION_CODE, pkgLite.getLongVersionCode()); - populateInstallerExtras(integrityVerification); - - // send to integrity component only. - integrityVerification.setPackage("android"); - - final BroadcastOptions options = BroadcastOptions.makeBasic(); - - mPm.mContext.sendOrderedBroadcastAsUser(integrityVerification, UserHandle.SYSTEM, - /* receiverPermission= */ null, - /* appOp= */ AppOpsManager.OP_NONE, - /* options= */ options.toBundle(), - new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - final Message msg = - mPm.mHandler.obtainMessage(CHECK_PENDING_INTEGRITY_VERIFICATION); - msg.arg1 = verificationId; - mPm.mHandler.sendMessageDelayed(msg, getIntegrityVerificationTimeout()); - } - }, /* scheduler= */ null, - /* initialCode= */ 0, - /* initialData= */ null, - /* initialExtras= */ null); - - Trace.asyncTraceBegin( - TRACE_TAG_PACKAGE_MANAGER, "integrity_verification", verificationId); - - // stop the copy until verification succeeds. - mWaitForIntegrityVerificationToComplete = true; - } - - - /** - * Get the integrity verification timeout. - * - * @return verification timeout in milliseconds - */ - private long getIntegrityVerificationTimeout() { - long timeout = Settings.Global.getLong(mPm.mContext.getContentResolver(), - Settings.Global.APP_INTEGRITY_VERIFICATION_TIMEOUT, - DEFAULT_INTEGRITY_VERIFICATION_TIMEOUT); - // The setting can be used to increase the timeout but not decrease it, since that is - // equivalent to disabling the integrity component. - return Math.max(timeout, DEFAULT_INTEGRITY_VERIFICATION_TIMEOUT); - } - - /** - * Check whether or not integrity verification has been enabled. - */ - private boolean isIntegrityVerificationEnabled() { - // We are not exposing this as a user-configurable setting because we don't want to provide - // an easy way to get around the integrity check. - return DEFAULT_INTEGRITY_VERIFY_ENABLE; - } /** * Send a request to verifier(s) to verify the package if necessary. @@ -827,11 +736,6 @@ final class VerifyingSession { handleReturnCode(); } - void handleIntegrityVerificationFinished() { - mWaitForIntegrityVerificationToComplete = false; - handleReturnCode(); - } - void handleRollbackEnabled() { // TODO(b/112431924): Consider halting the install if we // couldn't enable rollback. @@ -840,7 +744,7 @@ final class VerifyingSession { } void handleReturnCode() { - if (mWaitForVerificationToComplete || mWaitForIntegrityVerificationToComplete + if (mWaitForVerificationToComplete || mWaitForEnableRollbackToComplete) { return; } diff --git a/services/core/java/com/android/server/pm/permission/AccessCheckDelegate.java b/services/core/java/com/android/server/pm/permission/AccessCheckDelegate.java index e9cb279439a6..e989d6875d15 100644 --- a/services/core/java/com/android/server/pm/permission/AccessCheckDelegate.java +++ b/services/core/java/com/android/server/pm/permission/AccessCheckDelegate.java @@ -40,7 +40,7 @@ import com.android.internal.util.ArrayUtils; import com.android.internal.util.function.DodecFunction; import com.android.internal.util.function.HexConsumer; import com.android.internal.util.function.HexFunction; -import com.android.internal.util.function.OctFunction; +import com.android.internal.util.function.NonaFunction; import com.android.internal.util.function.QuadFunction; import com.android.internal.util.function.TriFunction; import com.android.internal.util.function.UndecFunction; @@ -351,22 +351,22 @@ public interface AccessCheckDelegate extends CheckPermissionDelegate, CheckOpsDe @Override public SyncNotedAppOp noteOperation(int code, int uid, @Nullable String packageName, @Nullable String featureId, int virtualDeviceId, boolean shouldCollectAsyncNotedOp, - @Nullable String message, boolean shouldCollectMessage, - @NonNull OctFunction<Integer, Integer, String, String, Integer, Boolean, String, - Boolean, SyncNotedAppOp> superImpl) { + @Nullable String message, boolean shouldCollectMessage, int notedCount, + @NonNull NonaFunction<Integer, Integer, String, String, Integer, Boolean, String, + Boolean, Integer, SyncNotedAppOp> superImpl) { if (uid == mDelegateAndOwnerUid && isDelegateOp(code)) { final int shellUid = UserHandle.getUid(UserHandle.getUserId(uid), Process.SHELL_UID); final long identity = Binder.clearCallingIdentity(); try { return superImpl.apply(code, shellUid, SHELL_PKG, featureId, virtualDeviceId, - shouldCollectAsyncNotedOp, message, shouldCollectMessage); + shouldCollectAsyncNotedOp, message, shouldCollectMessage, notedCount); } finally { Binder.restoreCallingIdentity(identity); } } return superImpl.apply(code, uid, packageName, featureId, virtualDeviceId, - shouldCollectAsyncNotedOp, message, shouldCollectMessage); + shouldCollectAsyncNotedOp, message, shouldCollectMessage, notedCount); } @Override diff --git a/services/core/java/com/android/server/policy/AppOpsPolicy.java b/services/core/java/com/android/server/policy/AppOpsPolicy.java index ecffd382f542..33210e28281e 100644 --- a/services/core/java/com/android/server/policy/AppOpsPolicy.java +++ b/services/core/java/com/android/server/policy/AppOpsPolicy.java @@ -53,7 +53,7 @@ import com.android.internal.annotations.GuardedBy; import com.android.internal.util.function.DodecFunction; import com.android.internal.util.function.HexConsumer; import com.android.internal.util.function.HexFunction; -import com.android.internal.util.function.OctFunction; +import com.android.internal.util.function.NonaFunction; import com.android.internal.util.function.QuadFunction; import com.android.internal.util.function.UndecFunction; import com.android.server.LocalServices; @@ -246,11 +246,12 @@ public final class AppOpsPolicy implements AppOpsManagerInternal.CheckOpsDelegat public SyncNotedAppOp noteOperation(int code, int uid, @Nullable String packageName, @Nullable String attributionTag, int virtualDeviceId, boolean shouldCollectAsyncNotedOp, @Nullable String message, - boolean shouldCollectMessage, @NonNull OctFunction<Integer, Integer, String, String, - Integer, Boolean, String, Boolean, SyncNotedAppOp> superImpl) { + boolean shouldCollectMessage, int notedCount, + @NonNull NonaFunction<Integer, Integer, String, String, + Integer, Boolean, String, Boolean, Integer, SyncNotedAppOp> superImpl) { return superImpl.apply(resolveDatasourceOp(code, uid, packageName, attributionTag), resolveUid(code, uid), packageName, attributionTag, virtualDeviceId, - shouldCollectAsyncNotedOp, message, shouldCollectMessage); + shouldCollectAsyncNotedOp, message, shouldCollectMessage, notedCount); } @Override diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 8e7302322d47..7c4d4253157e 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4426,9 +4426,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { int screenDisplayId = displayId < 0 ? DEFAULT_DISPLAY : displayId; float minLinearBrightness = mPowerManager.getBrightnessConstraint( - PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM); + screenDisplayId, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM); float maxLinearBrightness = mPowerManager.getBrightnessConstraint( - PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM); + screenDisplayId, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM); float linearBrightness = mDisplayManager.getBrightness(screenDisplayId); float gammaBrightness = BrightnessUtils.convertLinearToGamma(linearBrightness); diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index c573293cbf48..36bc0b93cd7c 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -6099,16 +6099,28 @@ public final class PowerManagerService extends SystemService } } - public float getBrightnessConstraint(int constraint) { + @Override + public float getBrightnessConstraint( + int displayId, @PowerManager.BrightnessConstraint int constraint) { + DisplayInfo info = null; + if (android.companion.virtualdevice.flags.Flags.displayPowerManagerApis() + && mDisplayManagerInternal != null) { + info = mDisplayManagerInternal.getDisplayInfo(displayId); + } switch (constraint) { case PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM: - return mScreenBrightnessMinimum; + return info != null && isValidBrightnessValue(info.brightnessMinimum) + ? info.brightnessMinimum : mScreenBrightnessMinimum; case PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM: - return mScreenBrightnessMaximum; + return info != null && isValidBrightnessValue(info.brightnessMaximum) + ? info.brightnessMaximum : mScreenBrightnessMaximum; case PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT: - return mScreenBrightnessDefault; + return info != null && isValidBrightnessValue(info.brightnessDefault) + ? info.brightnessDefault : mScreenBrightnessDefault; case PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DIM: - return mScreenBrightnessDim; + return android.companion.virtualdevice.flags.Flags.deviceAwareDisplayPower() + && info != null && isValidBrightnessValue(info.brightnessDim) + ? info.brightnessDim : mScreenBrightnessDim; default: return PowerManager.BRIGHTNESS_INVALID_FLOAT; } diff --git a/services/core/java/com/android/server/power/hint/HintManagerService.java b/services/core/java/com/android/server/power/hint/HintManagerService.java index 0f6688f73c22..987a84994451 100644 --- a/services/core/java/com/android/server/power/hint/HintManagerService.java +++ b/services/core/java/com/android/server/power/hint/HintManagerService.java @@ -41,6 +41,7 @@ import android.hardware.power.GpuHeadroomResult; import android.hardware.power.IPower; import android.hardware.power.SessionConfig; import android.hardware.power.SessionTag; +import android.hardware.power.SupportInfo; import android.hardware.power.WorkDuration; import android.os.Binder; import android.os.CpuHeadroomParamsInternal; @@ -103,7 +104,6 @@ public final class HintManagerService extends SystemService { // The minimum interval between the headroom calls as rate limiting. private static final int DEFAULT_GPU_HEADROOM_INTERVAL_MILLIS = 1000; private static final int DEFAULT_CPU_HEADROOM_INTERVAL_MILLIS = 1000; - private static final int HEADROOM_INTERVAL_UNSUPPORTED = -1; @VisibleForTesting final long mHintSessionPreferredRate; @@ -181,6 +181,7 @@ public final class HintManagerService extends SystemService { private final IPower mPowerHal; private int mPowerHalVersion; + private SupportInfo mSupportInfo = null; private final PackageManager mPackageManager; private boolean mUsesFmq; @@ -248,13 +249,11 @@ public final class HintManagerService extends SystemService { @GuardedBy("mCpuHeadroomLock") private final HeadroomCache<CpuHeadroomParams, CpuHeadroomResult> mCpuHeadroomCache; - private final long mCpuHeadroomIntervalMillis; private final Object mGpuHeadroomLock = new Object(); @GuardedBy("mGpuHeadroomLock") private final HeadroomCache<GpuHeadroomParams, GpuHeadroomResult> mGpuHeadroomCache; - private final long mGpuHeadroomIntervalMillis; // these are set to default values in CpuHeadroomParamsInternal and GpuHeadroomParamsInternal private final int mDefaultCpuHeadroomCalculationWindowMillis; @@ -296,79 +295,40 @@ public final class HintManagerService extends SystemService { mPowerHal = injector.createIPower(); mPowerHalVersion = 0; mUsesFmq = false; - long cpuHeadroomIntervalMillis = HEADROOM_INTERVAL_UNSUPPORTED; - long gpuHeadroomIntervalMillis = HEADROOM_INTERVAL_UNSUPPORTED; if (mPowerHal != null) { - try { - mPowerHalVersion = mPowerHal.getInterfaceVersion(); - if (mPowerHal.getInterfaceVersion() >= 6) { - if (SystemProperties.getBoolean(PROPERTY_USE_HAL_HEADROOMS, true)) { - cpuHeadroomIntervalMillis = checkCpuHeadroomSupport(); - gpuHeadroomIntervalMillis = checkGpuHeadroomSupport(); - } - } - } catch (RemoteException e) { - throw new IllegalStateException("Could not contact PowerHAL!", e); - } + mSupportInfo = getSupportInfo(); } - mCpuHeadroomIntervalMillis = cpuHeadroomIntervalMillis; mDefaultCpuHeadroomCalculationWindowMillis = new CpuHeadroomParamsInternal().calculationWindowMillis; mDefaultGpuHeadroomCalculationWindowMillis = new GpuHeadroomParamsInternal().calculationWindowMillis; - mGpuHeadroomIntervalMillis = gpuHeadroomIntervalMillis; - if (mCpuHeadroomIntervalMillis > 0) { - mCpuHeadroomCache = new HeadroomCache<>(2, mCpuHeadroomIntervalMillis); + if (mSupportInfo.headroom.isCpuSupported) { + mCpuHeadroomCache = new HeadroomCache<>(2, mSupportInfo.headroom.cpuMinIntervalMillis); } else { mCpuHeadroomCache = null; } - if (mGpuHeadroomIntervalMillis > 0) { - mGpuHeadroomCache = new HeadroomCache<>(2, mGpuHeadroomIntervalMillis); + if (mSupportInfo.headroom.isGpuSupported) { + mGpuHeadroomCache = new HeadroomCache<>(2, mSupportInfo.headroom.gpuMinIntervalMillis); } else { mGpuHeadroomCache = null; } } - private long checkCpuHeadroomSupport() { - final CpuHeadroomParams params = new CpuHeadroomParams(); - params.tids = new int[]{Process.myPid()}; + SupportInfo getSupportInfo() { try { - synchronized (mCpuHeadroomLock) { - final CpuHeadroomResult ret = mPowerHal.getCpuHeadroom(params); - if (ret != null && ret.getTag() == CpuHeadroomResult.globalHeadroom - && !Float.isNaN(ret.getGlobalHeadroom())) { - return Math.max( - DEFAULT_CPU_HEADROOM_INTERVAL_MILLIS, - mPowerHal.getCpuHeadroomMinIntervalMillis()); - } + mPowerHalVersion = mPowerHal.getInterfaceVersion(); + if (mPowerHalVersion >= 6) { + return mPowerHal.getSupportInfo(); } - - } catch (UnsupportedOperationException e) { - Slog.w(TAG, "getCpuHeadroom HAL API is not supported, params: " + params, e); } catch (RemoteException e) { - Slog.e(TAG, "getCpuHeadroom HAL API fails, disabling the API, params: " + params, e); + throw new IllegalStateException("Could not contact PowerHAL!", e); } - return HEADROOM_INTERVAL_UNSUPPORTED; - } - private long checkGpuHeadroomSupport() { - final GpuHeadroomParams params = new GpuHeadroomParams(); - try { - synchronized (mGpuHeadroomLock) { - final GpuHeadroomResult ret = mPowerHal.getGpuHeadroom(params); - if (ret != null && ret.getTag() == GpuHeadroomResult.globalHeadroom && !Float.isNaN( - ret.getGlobalHeadroom())) { - return Math.max( - DEFAULT_GPU_HEADROOM_INTERVAL_MILLIS, - mPowerHal.getGpuHeadroomMinIntervalMillis()); - } - } - } catch (UnsupportedOperationException e) { - Slog.w(TAG, "getGpuHeadroom HAL API is not supported, params: " + params, e); - } catch (RemoteException e) { - Slog.e(TAG, "getGpuHeadroom HAL API fails, disabling the API, params: " + params, e); - } - return HEADROOM_INTERVAL_UNSUPPORTED; + SupportInfo supportInfo = new SupportInfo(); + supportInfo.headroom = new SupportInfo.HeadroomSupportInfo(); + supportInfo.headroom.isCpuSupported = false; + supportInfo.headroom.isGpuSupported = false; + return supportInfo; } private ServiceThread createCleanUpThread() { @@ -557,7 +517,7 @@ public final class HintManagerService extends SystemService { return targetDurations; } } - private boolean isHalSupported() { + private boolean isHintSessionSupported() { return mHintSessionPreferredRate != -1; } @@ -1267,7 +1227,7 @@ public final class HintManagerService extends SystemService { public IHintSession createHintSessionWithConfig(@NonNull IBinder token, @SessionTag int tag, SessionCreationConfig creationConfig, SessionConfig config) { - if (!isHalSupported()) { + if (!isHintSessionSupported()) { throw new UnsupportedOperationException("PowerHAL is not supported!"); } @@ -1488,14 +1448,13 @@ public final class HintManagerService extends SystemService { @Override public CpuHeadroomResult getCpuHeadroom(@NonNull CpuHeadroomParamsInternal params) { - if (mCpuHeadroomIntervalMillis <= 0) { + if (!mSupportInfo.headroom.isCpuSupported) { throw new UnsupportedOperationException(); } final CpuHeadroomParams halParams = new CpuHeadroomParams(); halParams.tids = new int[]{Binder.getCallingPid()}; halParams.calculationType = params.calculationType; halParams.calculationWindowMillis = params.calculationWindowMillis; - halParams.selectionType = params.selectionType; if (params.usesDeviceHeadroom) { halParams.tids = new int[]{}; } else if (params.tids != null && params.tids.length > 0) { @@ -1544,7 +1503,7 @@ public final class HintManagerService extends SystemService { @Override public GpuHeadroomResult getGpuHeadroom(@NonNull GpuHeadroomParamsInternal params) { - if (mGpuHeadroomIntervalMillis <= 0) { + if (!mSupportInfo.headroom.isGpuSupported) { throw new UnsupportedOperationException(); } final GpuHeadroomParams halParams = new GpuHeadroomParams(); @@ -1579,18 +1538,18 @@ public final class HintManagerService extends SystemService { @Override public long getCpuHeadroomMinIntervalMillis() { - if (mCpuHeadroomIntervalMillis <= 0) { + if (!mSupportInfo.headroom.isCpuSupported) { throw new UnsupportedOperationException(); } - return mCpuHeadroomIntervalMillis; + return mSupportInfo.headroom.cpuMinIntervalMillis; } @Override public long getGpuHeadroomMinIntervalMillis() { - if (mGpuHeadroomIntervalMillis <= 0) { + if (!mSupportInfo.headroom.isGpuSupported) { throw new UnsupportedOperationException(); } - return mGpuHeadroomIntervalMillis; + return mSupportInfo.headroom.gpuMinIntervalMillis; } @Override @@ -1609,7 +1568,7 @@ public final class HintManagerService extends SystemService { } pw.println("HintSessionPreferredRate: " + mHintSessionPreferredRate); pw.println("MaxGraphicsPipelineThreadsCount: " + MAX_GRAPHICS_PIPELINE_THREADS_COUNT); - pw.println("HAL Support: " + isHalSupported()); + pw.println("HAL Support: " + isHintSessionSupported()); pw.println("Active Sessions:"); synchronized (mLock) { for (int i = 0; i < mActiveSessions.size(); i++) { @@ -1625,20 +1584,13 @@ public final class HintManagerService extends SystemService { } } } - pw.println("CPU Headroom Interval: " + mCpuHeadroomIntervalMillis); - pw.println("GPU Headroom Interval: " + mGpuHeadroomIntervalMillis); + pw.println("CPU Headroom Interval: " + mSupportInfo.headroom.cpuMinIntervalMillis); + pw.println("GPU Headroom Interval: " + mSupportInfo.headroom.gpuMinIntervalMillis); try { CpuHeadroomParamsInternal params = new CpuHeadroomParamsInternal(); - params.selectionType = CpuHeadroomParams.SelectionType.ALL; params.usesDeviceHeadroom = true; CpuHeadroomResult ret = getCpuHeadroom(params); pw.println("CPU headroom: " + (ret == null ? "N/A" : ret.getGlobalHeadroom())); - params = new CpuHeadroomParamsInternal(); - params.selectionType = CpuHeadroomParams.SelectionType.PER_CORE; - params.usesDeviceHeadroom = true; - ret = getCpuHeadroom(params); - pw.println("CPU headroom per core: " + (ret == null ? "N/A" - : Arrays.toString(ret.getPerCoreHeadroom()))); } catch (Exception e) { Slog.d(TAG, "Failed to dump CPU headroom", e); pw.println("CPU headroom: N/A"); diff --git a/services/core/java/com/android/server/vibrator/VendorVibrationSession.java b/services/core/java/com/android/server/vibrator/VendorVibrationSession.java index 15c3099511f9..1b6ce9dacfa9 100644 --- a/services/core/java/com/android/server/vibrator/VendorVibrationSession.java +++ b/services/core/java/com/android/server/vibrator/VendorVibrationSession.java @@ -119,6 +119,7 @@ final class VendorVibrationSession extends IVibrationSession.Stub @Override public void finishSession() { + Slog.d(TAG, "Session finish requested, ending vibration session..."); // Do not abort session in HAL, wait for ongoing vibration requests to complete. // This might take a while to end the session, but it can be aborted by cancelSession. requestEndSession(Status.FINISHED, /* shouldAbort= */ false, /* isVendorRequest= */ true); @@ -126,6 +127,7 @@ final class VendorVibrationSession extends IVibrationSession.Stub @Override public void cancelSession() { + Slog.d(TAG, "Session cancel requested, aborting vibration session..."); // Always abort session in HAL while cancelling it. // This might be triggered after finishSession was already called. requestEndSession(Status.CANCELLED_BY_USER, /* shouldAbort= */ true, @@ -228,13 +230,14 @@ final class VendorVibrationSession extends IVibrationSession.Stub @Override public void notifySessionCallback() { synchronized (mLock) { + Slog.d(TAG, "Session callback received, ending vibration session..."); // If end was not requested then the HAL has cancelled the session. maybeSetEndRequestLocked(Status.CANCELLED_BY_UNKNOWN_REASON, /* isVendorRequest= */ false); maybeSetStatusToRequestedLocked(); clearVibrationConductor(); + mHandler.post(() -> mManagerHooks.onSessionReleased(mSessionId)); } - mHandler.post(() -> mManagerHooks.onSessionReleased(mSessionId)); } @Override diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index bbef5785dfcb..415896b6230f 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -50,6 +50,7 @@ import static com.android.window.flags.Flags.multiCrop; import static com.android.window.flags.Flags.offloadColorExtraction; import android.annotation.NonNull; +import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityOptions; import android.app.AppGlobals; @@ -2487,7 +2488,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub @Override public WallpaperInfo getWallpaperInfoWithFlags(@SetWallpaperFlags int which, int userId) { if (liveWallpaperContentHandling()) { - return getWallpaperInstance(which, userId, false).getInfo(); + WallpaperInstance instance = getWallpaperInstance(which, userId, false); + return (instance != null) ? instance.getInfo() : null; } userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), @@ -2509,7 +2511,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub return null; } - @NonNull + @Nullable @Override public WallpaperInstance getWallpaperInstance(@SetWallpaperFlags int which, int userId) { return getWallpaperInstance(which, userId, true); @@ -2517,28 +2519,27 @@ public class WallpaperManagerService extends IWallpaperManager.Stub private WallpaperInstance getWallpaperInstance(@SetWallpaperFlags int which, int userId, boolean requireReadWallpaper) { - final WallpaperInstance defaultInstance = new WallpaperInstance(null, - new WallpaperDescription.Builder().build()); userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, false, true, "getWallpaperInfo", null); synchronized (mLock) { WallpaperData wallpaper = (which == FLAG_LOCK) ? mLockWallpaperMap.get(userId) : mWallpaperMap.get(userId); - if (wallpaper == null - || wallpaper.connection == null - || wallpaper.connection.mInfo == null) { - return defaultInstance; - } + if (wallpaper == null || wallpaper.connection == null) return null; WallpaperInfo info = wallpaper.connection.mInfo; - boolean canQueryPackage = mPackageManagerInternal.canQueryPackage( + boolean canQueryPackage = (info == null) || mPackageManagerInternal.canQueryPackage( Binder.getCallingUid(), info.getComponent().getPackageName()); if (hasPermission(READ_WALLPAPER_INTERNAL) || (canQueryPackage && !requireReadWallpaper)) { - return new WallpaperInstance(info, wallpaper.getDescription()); + // TODO(b/380245309) Remove this when crops are part of the description. + WallpaperDescription description = + wallpaper.getDescription().toBuilder().setCropHints( + wallpaper.mCropHints).build(); + return new WallpaperInstance(info, description); + } else { + return null; } } - return defaultInstance; } @Override diff --git a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java index 7fc11e6c3ac9..3c0e0582e8a8 100644 --- a/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java +++ b/services/core/java/com/android/server/wm/AccessibilityWindowsPopulator.java @@ -150,11 +150,7 @@ public final class AccessibilityWindowsPopulator extends WindowInfosListener { @Override public void onWindowInfosChanged(InputWindowHandle[] windowHandles, DisplayInfo[] displayInfos) { - if (com.android.server.accessibility.Flags.removeOnWindowInfosChangedHandler()) { - onWindowInfosChangedInternal(windowHandles, displayInfos); - } else { - mHandler.post(() -> onWindowInfosChangedInternal(windowHandles, displayInfos)); - } + onWindowInfosChangedInternal(windowHandles, displayInfos); } private void onWindowInfosChangedInternal(InputWindowHandle[] windowHandles, diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 9956d8580686..3467f947ece4 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -10332,7 +10332,15 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A .isVisibilityUnknown(this)) { return false; } - if (!isVisibleRequested()) return true; + if (!isVisibleRequested()) { + // TODO(b/294925498): Remove this finishing check once we have accurate ready tracking. + if (task != null && task.getPausingActivity() == this) { + // Visibility of starting activities isn't calculated until pause-complete, so if + // this is not paused yet, don't consider it ready. + return false; + } + return true; + } if (mPendingRelaunchCount > 0) return false; // Wait for attach. That is the earliest time where we know if there will be an associated // display rotation. If we don't wait, the starting-window can finishDrawing first and diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 8ff08187c698..0ebdaed1bc02 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3794,6 +3794,12 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { r.setPictureInPictureParams(params); enterPipTransition.setPipActivity(r); r.mAutoEnteringPip = isAutoEnter; + + if (r.getTaskFragment() != null && r.getTaskFragment().isEmbeddedWithBoundsOverride() + && enterPipTransition != null) { + enterPipTransition.addFlag(FLAG_IN_TASK_WITH_EMBEDDED_ACTIVITY); + } + getTransitionController().startCollectOrQueue(enterPipTransition, (deferred) -> { getTransitionController().requestStartTransition(enterPipTransition, r.getTask(), null /* remoteTransition */, null /* displayChange */); diff --git a/services/core/java/com/android/server/wm/CameraCompatFreeformPolicy.java b/services/core/java/com/android/server/wm/CameraCompatFreeformPolicy.java index cb95b3655c61..ae65db46b242 100644 --- a/services/core/java/com/android/server/wm/CameraCompatFreeformPolicy.java +++ b/services/core/java/com/android/server/wm/CameraCompatFreeformPolicy.java @@ -38,7 +38,9 @@ import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.CameraCompatTaskInfo; +import android.content.res.CompatibilityInfo; import android.content.res.Configuration; +import android.os.RemoteException; import android.view.DisplayInfo; import android.view.Surface; @@ -180,18 +182,37 @@ final class CameraCompatFreeformPolicy implements CameraStateMonitor.CameraCompa if (activity != null) { activity.recomputeConfiguration(); mCameraTask.dispatchTaskInfoChangedIfNeeded(/* force= */ true); + updateCompatibilityInfo(activity); activity.ensureActivityConfiguration(/* ignoreVisibility= */ true); } else { mCameraTask.dispatchTaskInfoChangedIfNeeded(/* force= */ true); } } + private void updateCompatibilityInfo(@NonNull ActivityRecord activityRecord) { + final CompatibilityInfo compatibilityInfo = activityRecord.mAtmService + .compatibilityInfoForPackageLocked(activityRecord.info.applicationInfo); + compatibilityInfo.applicationDisplayRotation = + CameraCompatTaskInfo.getDisplayRotationFromCameraCompatMode( + getCameraCompatMode(activityRecord)); + try { + // TODO(b/380840084): Consider using a ClientTransaction for this update. + activityRecord.app.getThread().updatePackageCompatibilityInfo( + activityRecord.packageName, compatibilityInfo); + } catch (RemoteException e) { + ProtoLog.w(WmProtoLogGroups.WM_DEBUG_STATES, + "Unable to update CompatibilityInfo for app %s", activityRecord.app); + } + } + boolean shouldCameraCompatControlOrientation(@NonNull ActivityRecord activity) { return isCameraRunningAndWindowingModeEligible(activity); } boolean isCameraRunningAndWindowingModeEligible(@NonNull ActivityRecord activity) { - return activity.inFreeformWindowingMode() + return activity.mAppCompatController.getAppCompatCameraOverrides() + .shouldApplyFreeformTreatmentForCameraCompat() + && activity.inFreeformWindowingMode() && mCameraStateMonitor.isCameraRunningForActivity(activity); } diff --git a/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java b/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java index 4e79e377a2a3..37e8f6260420 100644 --- a/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java +++ b/services/core/java/com/android/server/wm/DeferredDisplayUpdater.java @@ -424,6 +424,7 @@ class DeferredDisplayUpdater { || first.brightnessMinimum != second.brightnessMinimum || first.brightnessMaximum != second.brightnessMaximum || first.brightnessDefault != second.brightnessDefault + || first.brightnessDim != second.brightnessDim || first.installOrientation != second.installOrientation || first.isForceSdr != second.isForceSdr || !Objects.equals(first.layoutLimitedRefreshRate, second.layoutLimitedRefreshRate) diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index e19096354d64..1f224e238c6e 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -2274,7 +2274,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp if (shellTransitions) { // Before setDisplayProjection is applied by the start transaction of transition, // set the transform hint to avoid using surface in old rotation. - getPendingTransaction().setFixedTransformHint(mSurfaceControl, rotation); + setFixedTransformHint(getPendingTransaction(), mSurfaceControl, rotation); // The sync transaction should already contains setDisplayProjection, so unset the // hint to restore the natural state when the transaction is applied. transaction.unsetFixedTransformHint(mSurfaceControl); @@ -2284,6 +2284,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp mWmService.mRotationWatcherController.dispatchDisplayRotationChange(mDisplayId, rotation); } + void setFixedTransformHint(Transaction t, SurfaceControl sc, int rotation) { + t.setFixedTransformHint(sc, (rotation + mDisplayInfo.installOrientation) % 4); + } + void configureDisplayPolicy() { mRootWindowContainer.updateDisplayImePolicyCache(); mDisplayPolicy.updateConfigurationAndScreenSizeDependentBehaviors(); diff --git a/services/core/java/com/android/server/wm/SeamlessRotator.java b/services/core/java/com/android/server/wm/SeamlessRotator.java index c20b85858c44..8f0f6860ceb6 100644 --- a/services/core/java/com/android/server/wm/SeamlessRotator.java +++ b/services/core/java/com/android/server/wm/SeamlessRotator.java @@ -56,7 +56,7 @@ public class SeamlessRotator { mOldRotation = oldRotation; mNewRotation = newRotation; mApplyFixedTransformHint = applyFixedTransformationHint; - mFixedTransformHint = oldRotation; + mFixedTransformHint = (oldRotation + info.installOrientation) % 4; final boolean flipped = info.rotation == ROTATION_90 || info.rotation == ROTATION_270; final int pH = flipped ? info.logicalWidth : info.logicalHeight; final int pW = flipped ? info.logicalHeight : info.logicalWidth; diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index 20481f25fa5c..1fc609b7d03a 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1429,7 +1429,16 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { // Commit wallpaper visibility after activity, because usually the wallpaper target token is // an activity, and wallpaper's visibility depends on activity's visibility. for (int i = mParticipants.size() - 1; i >= 0; --i) { - final WallpaperWindowToken wt = mParticipants.valueAt(i).asWallpaperToken(); + final WindowContainer<?> wc = mParticipants.valueAt(i); + WallpaperWindowToken wt = wc.asWallpaperToken(); + if (!Flags.ensureWallpaperInTransitions()) { + if (wt == null) { + final WindowState windowState = wc.asWindowState(); + if (windowState != null) { + wt = windowState.mToken.asWallpaperToken(); + } + } + } if (wt == null) continue; final WindowState target = wt.mDisplayContent.mWallpaperController.getWallpaperTarget(); final boolean isTargetInvisible = target == null || !target.mToken.isVisible(); diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index 2397e032fcc8..aa60f939f9aa 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -3733,7 +3733,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< && !mTransitionController.useShellTransitionsRotation()) { if (deltaRotation != Surface.ROTATION_0) { updateSurfaceRotation(t, deltaRotation, null /* positionLeash */); - getPendingTransaction().setFixedTransformHint(mSurfaceControl, + mDisplayContent.setFixedTransformHint(getPendingTransaction(), mSurfaceControl, getWindowConfiguration().getDisplayRotation()); } else if (deltaRotation != mLastDeltaRotation) { t.setMatrix(mSurfaceControl, 1, 0, 0, 1); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 9e1509cf95cc..00ade8088e82 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -69,6 +69,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; import static android.view.WindowManager.LayoutParams.FLAG_SLIPPERY; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL; +import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SENSITIVE_FOR_PRIVACY; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SPY; import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE; @@ -101,6 +102,7 @@ import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ER import static android.view.flags.Flags.sensitiveContentAppProtection; import static android.window.WindowProviderService.isWindowProviderService; +import static com.android.hardware.input.Flags.overridePowerKeyBehaviorInFocusedWindow; import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_ADD_REMOVE; import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_ANIM; import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_BOOT; @@ -157,9 +159,9 @@ import static com.android.server.wm.WindowManagerServiceDumpProto.INPUT_METHOD_W 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 static com.android.window.flags.Flags.enableDisplayFocusInShellTransitions; import static com.android.window.flags.Flags.multiCrop; import static com.android.window.flags.Flags.setScPropertiesInClient; -import static com.android.window.flags.Flags.enableDisplayFocusInShellTransitions; import android.Manifest; import android.Manifest.permission; @@ -7947,43 +7949,46 @@ public class WindowManagerService extends IWindowManager.Stub @Override public void waitForAllWindowsDrawn(Message message, long timeout, int displayId) { Objects.requireNonNull(message.getTarget()); - final WindowContainer<?> container = displayId == INVALID_DISPLAY - ? mRoot : mRoot.getDisplayContent(displayId); - if (container == null) { - // The waiting container doesn't exist, no need to wait to run the callback. Run and - // return; - message.sendToTarget(); - return; - } boolean allWindowsDrawn = false; synchronized (mGlobalLock) { - if (displayId == INVALID_DISPLAY - && mRoot.getDefaultDisplay().mDisplayUpdater.waitForTransition(message)) { - // Use the ready-to-play of transition as the signal. - return; - } - container.waitForAllWindowsDrawn(); - mWindowPlacerLocked.requestTraversal(); - mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT, container); - if (container.mWaitingForDrawn.isEmpty()) { - allWindowsDrawn = true; - } else { - if (Trace.isTagEnabled(TRACE_TAG_WINDOW_MANAGER)) { - for (int i = 0; i < container.mWaitingForDrawn.size(); i++) { - traceStartWaitingForWindowDrawn(container.mWaitingForDrawn.get(i)); - } - } - - mWaitingForDrawnCallbacks.put(container, message); - mH.sendNewMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, container, timeout); - checkDrawnWindowsLocked(); - } + allWindowsDrawn = waitForAllWindowsDrawnLocked(message, timeout, displayId); } if (allWindowsDrawn) { message.sendToTarget(); } } + /** Return {@code true} if all windows have been drawn. */ + private boolean waitForAllWindowsDrawnLocked(Message message, long timeout, int displayId) { + final WindowContainer<?> container = displayId == INVALID_DISPLAY + ? mRoot : mRoot.getDisplayContent(displayId); + if (container == null) { + // The waiting container doesn't exist, no need to wait. Treat as drawn. + return true; + } + if (displayId == INVALID_DISPLAY + && mRoot.getDefaultDisplay().mDisplayUpdater.waitForTransition(message)) { + // Use the ready-to-play of transition as the signal. + return false; + } + container.waitForAllWindowsDrawn(); + mWindowPlacerLocked.requestTraversal(); + mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT, container); + if (container.mWaitingForDrawn.isEmpty()) { + return true; + } + if (Trace.isTagEnabled(TRACE_TAG_WINDOW_MANAGER)) { + for (int i = 0; i < container.mWaitingForDrawn.size(); i++) { + traceStartWaitingForWindowDrawn(container.mWaitingForDrawn.get(i)); + } + } + + mWaitingForDrawnCallbacks.put(container, message); + mH.sendNewMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, container, timeout); + checkDrawnWindowsLocked(); + return false; + } + @Override public void setForcedDisplaySize(int displayId, int width, int height) { WindowManagerService.this.setForcedDisplaySize(displayId, width, height); @@ -9221,6 +9226,25 @@ public class WindowManagerService extends IWindowManager.Stub + "' because it isn't a trusted overlay"); return inputFeatures & ~INPUT_FEATURE_SENSITIVE_FOR_PRIVACY; } + + // You need OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW permission to be able + // to set INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS. + if (overridePowerKeyBehaviorInFocusedWindow() + && (inputFeatures + & INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS) + != 0) { + final int powerPermissionResult = + mContext.checkPermission( + permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW, + callingPid, + callingUid); + if (powerPermissionResult != PackageManager.PERMISSION_GRANTED) { + throw new IllegalArgumentException( + "Cannot use INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS from" + windowName + + " because it doesn't have the" + + " OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW permission"); + } + } return inputFeatures; } diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index 004f406035c0..832295a7e031 100644 --- a/services/core/java/com/android/server/wm/WindowToken.java +++ b/services/core/java/com/android/server/wm/WindowToken.java @@ -629,7 +629,7 @@ class WindowToken extends WindowContainer<WindowState> { .build(); t.setPosition(leash, mLastSurfacePosition.x, mLastSurfacePosition.y); t.reparent(getSurfaceControl(), leash); - getPendingTransaction().setFixedTransformHint(leash, + mDisplayContent.setFixedTransformHint(getPendingTransaction(), leash, getWindowConfiguration().getDisplayRotation()); mFixedRotationTransformLeash = leash; updateSurfaceRotation(t, rotation, mFixedRotationTransformLeash); diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 943019429c3f..5a457302108c 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -362,7 +362,7 @@ public: void setMotionClassifierEnabled(bool enabled); std::optional<std::string> getBluetoothAddress(int32_t deviceId); void setStylusButtonMotionEventsEnabled(bool enabled); - FloatPoint getMouseCursorPosition(ui::LogicalDisplayId displayId); + vec2 getMouseCursorPosition(ui::LogicalDisplayId displayId); void setStylusPointerIconEnabled(bool enabled); void setInputMethodConnectionIsActive(bool isActive); void setKeyRemapping(const std::map<int32_t, int32_t>& keyRemapping); @@ -441,7 +441,7 @@ public: std::shared_ptr<PointerControllerInterface> createPointerController( PointerControllerInterface::ControllerType type) override; void notifyPointerDisplayIdChanged(ui::LogicalDisplayId displayId, - const FloatPoint& position) override; + const vec2& position) override; void notifyMouseCursorFadedOnTyping() override; /* --- InputFilterPolicyInterface implementation --- */ @@ -871,7 +871,7 @@ std::shared_ptr<PointerControllerInterface> NativeInputManager::createPointerCon } void NativeInputManager::notifyPointerDisplayIdChanged(ui::LogicalDisplayId pointerDisplayId, - const FloatPoint& position) { + const vec2& position) { // Notify the Reader so that devices can be reconfigured. { // acquire lock std::scoped_lock _l(mLock); @@ -2023,7 +2023,7 @@ void NativeInputManager::setStylusButtonMotionEventsEnabled(bool enabled) { InputReaderConfiguration::Change::STYLUS_BUTTON_REPORTING); } -FloatPoint NativeInputManager::getMouseCursorPosition(ui::LogicalDisplayId displayId) { +vec2 NativeInputManager::getMouseCursorPosition(ui::LogicalDisplayId displayId) { return mInputManager->getChoreographer().getMouseCursorPosition(displayId); } diff --git a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java index e73dacbed9a3..0c9a89bb0a30 100644 --- a/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java +++ b/services/credentials/java/com/android/server/credentials/CredentialManagerUi.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.credentials.CredentialManager; import android.credentials.CredentialProviderInfo; +import android.credentials.flags.Flags; import android.credentials.selection.DisabledProviderData; import android.credentials.selection.IntentCreationResult; import android.credentials.selection.IntentFactory; @@ -46,6 +47,12 @@ import java.util.UUID; /** Initiates the Credential Manager UI and receives results. */ public class CredentialManagerUi { + + private static final String SESSION_ID_TRACK_ONE = + "com.android.server.credentials.CredentialManagerUi.SESSION_ID_TRACK_ONE"; + private static final String SESSION_ID_TRACK_TWO = + "com.android.server.credentials.CredentialManagerUi.SESSION_ID_TRACK_TWO"; + @NonNull private final CredentialManagerUiCallback mCallbacks; @NonNull @@ -148,8 +155,8 @@ public class CredentialManagerUi { * by the calling app process. The bottom-sheet navigates to the default page when the intent * is invoked. * - * @param requestInfo the information about the request - * @param providerDataList the list of provider data from remote providers + * @param requestInfo the information about the request + * @param providerDataList the list of provider data from remote providers */ public PendingIntent createPendingIntent( RequestInfo requestInfo, ArrayList<ProviderData> providerDataList, @@ -175,6 +182,11 @@ public class CredentialManagerUi { mContext, intentCreationResult, mUserId); Intent intent = intentCreationResult.getIntent(); intent.setAction(UUID.randomUUID().toString()); + if (Flags.frameworkSessionIdMetricBundle()) { + intent.putExtra(SESSION_ID_TRACK_ONE, + requestSessionMetric.getInitialPhaseMetric().getSessionIdCaller()); + intent.putExtra(SESSION_ID_TRACK_TWO, requestSessionMetric.getSessionIdTrackTwo()); + } //TODO: Create unique pending intent using request code and cancel any pre-existing pending // intents return PendingIntent.getActivityAsUser( @@ -192,8 +204,8 @@ public class CredentialManagerUi { * each autofill id and passed in as extras in the pending intent set as authentication * of the pinned entry. * - * @param requestInfo the information about the request - * @param requestSessionMetric the metric object for logging + * @param requestInfo the information about the request + * @param requestSessionMetric the metric object for logging */ public Intent createIntentForAutofill(RequestInfo requestInfo, RequestSessionMetric requestSessionMetric) { diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ac1219c35c3b..4d318f9036eb 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -26,6 +26,7 @@ import static android.Manifest.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL import static android.Manifest.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_AIRPLANE_MODE; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_APPS_CONTROL; +import static android.Manifest.permission.MANAGE_DEVICE_POLICY_APP_FUNCTIONS; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_APP_RESTRICTIONS; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_ASSIST_CONTENT; import static android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIO_OUTPUT; @@ -126,6 +127,7 @@ import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_DEV import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE; import static android.app.admin.DevicePolicyManager.ACTION_PROVISION_MANAGED_USER; import static android.app.admin.DevicePolicyManager.ACTION_SYSTEM_UPDATE_POLICY_CHANGED; +import static android.app.admin.DevicePolicyManager.APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY; import static android.app.admin.DevicePolicyManager.CONTENT_PROTECTION_DISABLED; import static android.app.admin.DevicePolicyManager.ContentProtectionPolicy; import static android.app.admin.DevicePolicyManager.DELEGATION_APP_RESTRICTIONS; @@ -332,6 +334,7 @@ import android.app.admin.DevicePolicyCache; import android.app.admin.DevicePolicyDrawableResource; import android.app.admin.DevicePolicyEventLogger; import android.app.admin.DevicePolicyManager; +import android.app.admin.DevicePolicyManager.AppFunctionsPolicy; import android.app.admin.DevicePolicyManager.DeviceOwnerType; import android.app.admin.DevicePolicyManager.DevicePolicyOperation; import android.app.admin.DevicePolicyManager.OperationSafetyReason; @@ -9085,11 +9088,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } CallerIdentity caller = getCallerIdentity(who); - if (!Flags.setAutoTimeEnabledCoexistence()) { + if (Flags.setAutoTimeEnabledCoexistence()) { + Preconditions.checkCallAuthorization(hasPermission(SET_TIME, caller.getPackageName())); + } else { Objects.requireNonNull(who, "ComponentName is null"); - } - Preconditions.checkCallAuthorization(isProfileOwnerOnUser0(caller) + Preconditions.checkCallAuthorization(isProfileOwnerOnUser0(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller) || isDefaultDeviceOwner(caller)); + } return mInjector.settingsGlobalGetInt(Global.AUTO_TIME, 0) > 0; } @@ -9166,10 +9171,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } CallerIdentity caller = getCallerIdentity(who); - - if (!Flags.setAutoTimeZoneEnabledCoexistence()) { - Objects.requireNonNull(who, "ComponentName is null"); - } + Objects.requireNonNull(who, "ComponentName is null"); Preconditions.checkCallAuthorization(isProfileOwnerOnUser0(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller) || isDefaultDeviceOwner( caller)); @@ -9193,10 +9195,15 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } CallerIdentity caller = getCallerIdentity(who); - Objects.requireNonNull(who, "ComponentName is null"); - Preconditions.checkCallAuthorization(isProfileOwnerOnUser0(caller) + if (Flags.setAutoTimeZoneEnabledCoexistence()) { + Preconditions.checkCallAuthorization( + hasPermission(SET_TIME_ZONE, caller.getPackageName())); + } else { + Objects.requireNonNull(who, "ComponentName is null"); + Preconditions.checkCallAuthorization(isProfileOwnerOnUser0(caller) || isProfileOwnerOfOrganizationOwnedDevice(caller) || isDefaultDeviceOwner( caller)); + } return mInjector.settingsGlobalGetInt(Global.AUTO_TIME_ZONE, 0) > 0; } @@ -22970,6 +22977,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL, MANAGE_DEVICE_POLICY_AIRPLANE_MODE, MANAGE_DEVICE_POLICY_APPS_CONTROL, + MANAGE_DEVICE_POLICY_APP_FUNCTIONS, MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, MANAGE_DEVICE_POLICY_AUDIO_OUTPUT, MANAGE_DEVICE_POLICY_AUTOFILL, @@ -23057,6 +23065,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { MANAGE_DEVICE_POLICY_ACCOUNT_MANAGEMENT, MANAGE_DEVICE_POLICY_ACROSS_USERS_SECURITY_CRITICAL, MANAGE_DEVICE_POLICY_APPS_CONTROL, + MANAGE_DEVICE_POLICY_APP_FUNCTIONS, MANAGE_DEVICE_POLICY_APP_RESTRICTIONS, MANAGE_DEVICE_POLICY_AUDIO_OUTPUT, MANAGE_DEVICE_POLICY_AUTOFILL, @@ -23306,6 +23315,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { MANAGE_DEVICE_POLICY_ACROSS_USERS); CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_CONTENT_PROTECTION, MANAGE_DEVICE_POLICY_ACROSS_USERS); + CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_APP_FUNCTIONS, + MANAGE_DEVICE_POLICY_ACROSS_USERS); // These permissions may grant access to user data and therefore must be protected with // MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL for cross-user calls. @@ -23971,6 +23982,47 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } } + @Override + public void setAppFunctionsPolicy(String callerPackageName, @AppFunctionsPolicy int policy) { + if (!android.app.appfunctions.flags.Flags.enableAppFunctionManager()) { + return; + } + + CallerIdentity caller = getCallerIdentity(callerPackageName); + int userId = caller.getUserId(); + checkCanExecuteOrThrowUnsafe(DevicePolicyManager.OPERATION_SET_APP_FUNCTIONS_POLICY); + EnforcingAdmin enforcingAdmin = + enforcePermissionAndGetEnforcingAdmin( + /* who */null, MANAGE_DEVICE_POLICY_APP_FUNCTIONS, + callerPackageName, userId); + + if (policy == APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY) { + mDevicePolicyEngine.removeLocalPolicy( + PolicyDefinition.APP_FUNCTIONS, enforcingAdmin, userId); + } else { + mDevicePolicyEngine.setLocalPolicy( + PolicyDefinition.APP_FUNCTIONS, + enforcingAdmin, new IntegerPolicyValue(policy), + userId); + } + } + + @Override + public @AppFunctionsPolicy int getAppFunctionsPolicy(String callerPackageName, int userId) { + if (!android.app.appfunctions.flags.Flags.enableAppFunctionManager()) { + return APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY; + } + + CallerIdentity caller = getCallerIdentity(callerPackageName); + enforceCanQuery(MANAGE_DEVICE_POLICY_APP_FUNCTIONS, callerPackageName, userId); + Integer policy = + mDevicePolicyEngine.getResolvedPolicy(PolicyDefinition.APP_FUNCTIONS, userId); + if (policy == null) { + return APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY; + } + return policy; + } + private void updateContentProtectionPolicyCache(@UserIdInt int userId) { mPolicyCache.setContentProtectionPolicy( userId, diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java index 24b16b7c2c60..e4db4bdd773f 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java @@ -318,6 +318,20 @@ final class PolicyDefinition<V> { PolicyEnforcerCallbacks::setContentProtectionPolicy, new IntegerPolicySerializer()); + static PolicyDefinition<Integer> APP_FUNCTIONS = new PolicyDefinition<>( + new NoArgsPolicyKey(DevicePolicyIdentifiers.APP_FUNCTIONS_POLICY), + new MostRestrictive<>( + List.of( + new IntegerPolicyValue( + DevicePolicyManager.APP_FUNCTIONS_DISABLED), + new IntegerPolicyValue( + DevicePolicyManager.APP_FUNCTIONS_DISABLED_CROSS_PROFILE), + new IntegerPolicyValue( + DevicePolicyManager.APP_FUNCTIONS_NOT_CONTROLLED_BY_POLICY))), + POLICY_FLAG_LOCAL_ONLY_POLICY, + PolicyEnforcerCallbacks::noOp, + new IntegerPolicySerializer()); + static PolicyDefinition<Integer> PASSWORD_COMPLEXITY = new PolicyDefinition<>( new NoArgsPolicyKey(DevicePolicyIdentifiers.PASSWORD_COMPLEXITY_POLICY), new MostRestrictive<>( @@ -398,6 +412,8 @@ final class PolicyDefinition<V> { USB_DATA_SIGNALING); POLICY_DEFINITIONS.put(DevicePolicyIdentifiers.CONTENT_PROTECTION_POLICY, CONTENT_PROTECTION); + POLICY_DEFINITIONS.put(DevicePolicyIdentifiers.APP_FUNCTIONS_POLICY, + APP_FUNCTIONS); // Intentionally not flagged since if the flag is flipped off on a device already // having PASSWORD_COMPLEXITY policy in the on-device XML, it will cause the // deserialization logic to break due to seeing an unknown tag. diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index fde6ce26cb68..1b0b1ad131ac 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -429,6 +429,8 @@ public final class SystemServer implements Dumpable { "/apex/com.android.tethering/javalib/service-connectivity.jar"; private static final String CONNECTIVITY_SERVICE_INITIALIZER_CLASS = "com.android.server.ConnectivityServiceInitializer"; + private static final String CONNECTIVITY_SERVICE_INITIALIZER_B_CLASS = + "com.android.server.ConnectivityServiceInitializerB"; private static final String NETWORK_STATS_SERVICE_INITIALIZER_CLASS = "com.android.server.NetworkStatsServiceInitializer"; private static final String UWB_APEX_SERVICE_JAR_PATH = @@ -1486,7 +1488,6 @@ public final class SystemServer implements Dumpable { IStorageManager storageManager = null; NetworkManagementService networkManagement = null; VpnManagerService vpnManager = null; - VcnManagementService vcnManagement = null; NetworkPolicyManagerService networkPolicy = null; WindowManagerService wm = null; NetworkTimeUpdateService networkTimeUpdater = null; @@ -1927,6 +1928,10 @@ public final class SystemServer implements Dumpable { } t.traceEnd(); + t.traceBegin("UpdateMetricsIfNeeded"); + mPackageManagerService.updateMetricsIfNeeded(); + t.traceEnd(); + t.traceBegin("PerformFstrimIfNeeded"); try { mPackageManagerService.performFstrimIfNeeded(); @@ -2232,8 +2237,10 @@ public final class SystemServer implements Dumpable { t.traceBegin("StartVcnManagementService"); try { - vcnManagement = VcnManagementService.create(context); - ServiceManager.addService(Context.VCN_MANAGEMENT_SERVICE, vcnManagement); + // TODO: b/375213246 When VCN is in mainline module, load it from the apex path. + // Whether VCN will be in apex or in the platform will be gated by a build system + // flag. + mSystemServiceManager.startService(CONNECTIVITY_SERVICE_INITIALIZER_B_CLASS); } catch (Throwable e) { reportWtf("starting VCN Management Service", e); } @@ -3159,7 +3166,6 @@ public final class SystemServer implements Dumpable { final MediaRouterService mediaRouterF = mediaRouter; final MmsServiceBroker mmsServiceF = mmsService; final VpnManagerService vpnManagerF = vpnManager; - final VcnManagementService vcnManagementF = vcnManagement; final WindowManagerService windowManagerF = wm; final ConnectivityManager connectivityF = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); @@ -3286,15 +3292,6 @@ public final class SystemServer implements Dumpable { reportWtf("making VpnManagerService ready", e); } t.traceEnd(); - t.traceBegin("MakeVcnManagementServiceReady"); - try { - if (vcnManagementF != null) { - vcnManagementF.systemReady(); - } - } catch (Throwable e) { - reportWtf("making VcnManagementService ready", e); - } - t.traceEnd(); t.traceBegin("MakeNetworkPolicyServiceReady"); try { if (networkPolicyF != null) { diff --git a/services/people/java/com/android/server/people/prediction/ShareTargetPredictor.java b/services/people/java/com/android/server/people/prediction/ShareTargetPredictor.java index f5360eb9a56a..6b28047c2610 100644 --- a/services/people/java/com/android/server/people/prediction/ShareTargetPredictor.java +++ b/services/people/java/com/android/server/people/prediction/ShareTargetPredictor.java @@ -213,7 +213,8 @@ class ShareTargetPredictor extends AppTargetPredictor { } private int getShareEventType(IntentFilter intentFilter) { - String mimeType = intentFilter != null ? intentFilter.getDataType(0) : null; + String mimeType = (intentFilter != null && intentFilter.countDataTypes() > 0) + ? intentFilter.getDataType(0) : null; return getDataManager().mimeTypeToShareEventType(mimeType); } diff --git a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java index 02e0bbfd3519..eb61a40e0ba5 100644 --- a/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java +++ b/services/robotests/backup/src/com/android/server/backup/UserBackupManagerServiceTest.java @@ -30,13 +30,10 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; import static org.testng.Assert.expectThrows; import android.app.backup.BackupManager; @@ -90,7 +87,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -110,7 +106,6 @@ public class UserBackupManagerServiceTest { private static final String TAG = "BMSTest"; private static final String PACKAGE_1 = "some.package.1"; private static final String PACKAGE_2 = "some.package.2"; - private static final String USER_FACING_PACKAGE = "user.facing.package"; private static final int USER_ID = 10; @Mock private TransportManager mTransportManager; @@ -1213,47 +1208,6 @@ public class UserBackupManagerServiceTest { eq(packageTrackingReceiver), eq(UserHandle.of(USER_ID)), any(), any(), any()); } - @Test - public void testFilterUserFacingPackages_shouldSkipUserFacing_filtersUserFacing() { - List<PackageInfo> packages = Arrays.asList(getPackageInfo(USER_FACING_PACKAGE), - getPackageInfo(PACKAGE_1)); - UserBackupManagerService backupManagerService = spy( - createUserBackupManagerServiceAndRunTasks()); - when(backupManagerService.shouldSkipUserFacingData()).thenReturn(true); - when(backupManagerService.shouldSkipPackage(eq(USER_FACING_PACKAGE))).thenReturn(true); - - List<PackageInfo> filteredPackages = backupManagerService.filterUserFacingPackages( - packages); - - assertFalse(containsPackage(filteredPackages, USER_FACING_PACKAGE)); - assertTrue(containsPackage(filteredPackages, PACKAGE_1)); - } - - @Test - public void testFilterUserFacingPackages_shouldNotSkipUserFacing_doesNotFilterUserFacing() { - List<PackageInfo> packages = Arrays.asList(getPackageInfo(USER_FACING_PACKAGE), - getPackageInfo(PACKAGE_1)); - UserBackupManagerService backupManagerService = spy( - createUserBackupManagerServiceAndRunTasks()); - when(backupManagerService.shouldSkipUserFacingData()).thenReturn(false); - when(backupManagerService.shouldSkipPackage(eq(USER_FACING_PACKAGE))).thenReturn(true); - - List<PackageInfo> filteredPackages = backupManagerService.filterUserFacingPackages( - packages); - - assertTrue(containsPackage(filteredPackages, USER_FACING_PACKAGE)); - assertTrue(containsPackage(filteredPackages, PACKAGE_1)); - } - - private static boolean containsPackage(List<PackageInfo> packages, String targetPackage) { - for (PackageInfo packageInfo : packages) { - if (targetPackage.equals(packageInfo.packageName)) { - return true; - } - } - return false; - } - private UserBackupManagerService createUserBackupManagerServiceAndRunTasks() { return BackupManagerServiceTestUtils.createUserBackupManagerServiceAndRunTasks( USER_ID, mContext, mBackupThread, mBaseStateDir, mDataDir, mTransportManager); diff --git a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageVerificationStateTest.java b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageVerificationStateTest.java index a93e8ad93756..97f1bd46678f 100644 --- a/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageVerificationStateTest.java +++ b/services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageVerificationStateTest.java @@ -574,57 +574,16 @@ public class PackageVerificationStateTest extends AndroidTestCase { assertTrue(state.isInstallAllowed()); } - public void testAreAllVerificationsComplete_onlyVerificationPasses() { + public void testAreAllVerificationsComplete() { PackageVerificationState state = new PackageVerificationState(null); state.addRequiredVerifierUid(REQUIRED_UID_1); assertFalse(state.areAllVerificationsComplete()); state.setVerifierResponse(REQUIRED_UID_1, PackageManager.VERIFICATION_ALLOW); - assertFalse(state.areAllVerificationsComplete()); - } - - public void testAreAllVerificationsComplete_onlyIntegrityCheckPasses() { - PackageVerificationState state = new PackageVerificationState(null); - state.addRequiredVerifierUid(REQUIRED_UID_1); - assertFalse(state.areAllVerificationsComplete()); - - state.setIntegrityVerificationResult(PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW); - - assertFalse(state.areAllVerificationsComplete()); - } - - public void testAreAllVerificationsComplete_bothPasses() { - PackageVerificationState state = new PackageVerificationState(null); - state.addRequiredVerifierUid(REQUIRED_UID_1); - assertFalse(state.areAllVerificationsComplete()); - - state.setIntegrityVerificationResult(PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW); - state.setVerifierResponse(REQUIRED_UID_1, PackageManager.VERIFICATION_ALLOW); - assertTrue(state.areAllVerificationsComplete()); } - public void testAreAllVerificationsComplete_onlyVerificationFails() { - PackageVerificationState state = new PackageVerificationState(null); - state.addRequiredVerifierUid(REQUIRED_UID_1); - assertFalse(state.areAllVerificationsComplete()); - - state.setVerifierResponse(REQUIRED_UID_1, PackageManager.VERIFICATION_REJECT); - - assertFalse(state.areAllVerificationsComplete()); - } - - public void testAreAllVerificationsComplete_onlyIntegrityCheckFails() { - PackageVerificationState state = new PackageVerificationState(null); - state.addRequiredVerifierUid(REQUIRED_UID_1); - assertFalse(state.areAllVerificationsComplete()); - - state.setIntegrityVerificationResult(PackageManagerInternal.INTEGRITY_VERIFICATION_REJECT); - - assertFalse(state.areAllVerificationsComplete()); - } - private void processOnTimeout(PackageVerificationState state, int code, int uid) { // CHECK_PENDING_VERIFICATION handler. assertFalse("Verification should not be marked as complete yet", diff --git a/services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayTest.java b/services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayTest.java index b002a1f73006..241dc10747ac 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/LogicalDisplayTest.java @@ -16,6 +16,8 @@ package com.android.server.display; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -327,6 +329,23 @@ public class LogicalDisplayTest { } @Test + public void testBrightnessConfigurationFromDisplayDevice() { + mDisplayDeviceInfo.brightnessMinimum = 0.12f; + mDisplayDeviceInfo.brightnessDim = 0.34f; + mDisplayDeviceInfo.brightnessDefault = 0.56f; + mDisplayDeviceInfo.brightnessMaximum = 0.78f; + + mLogicalDisplay = new LogicalDisplay(DISPLAY_ID, LAYER_STACK, mDisplayDevice); + mLogicalDisplay.updateLocked(mDeviceRepo, mSyntheticModeManager); + + DisplayInfo info = mLogicalDisplay.getDisplayInfoLocked(); + assertThat(info.brightnessMinimum).isEqualTo(0.12f); + assertThat(info.brightnessDim).isEqualTo(0.34f); + assertThat(info.brightnessDefault).isEqualTo(0.56f); + assertThat(info.brightnessMaximum).isEqualTo(0.78f); + } + + @Test public void testGetDisplayPosition() { Point expectedPosition = new Point(0, 0); diff --git a/services/tests/displayservicetests/src/com/android/server/display/VirtualDisplayAdapterTest.java b/services/tests/displayservicetests/src/com/android/server/display/VirtualDisplayAdapterTest.java index 3ac7fb0dbe53..dbd5c65f9ba3 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/VirtualDisplayAdapterTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/VirtualDisplayAdapterTest.java @@ -16,6 +16,8 @@ package com.android.server.display; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -25,10 +27,12 @@ import android.hardware.display.IVirtualDisplayCallback; import android.hardware.display.VirtualDisplayConfig; import android.media.projection.IMediaProjection; import android.os.IBinder; +import android.os.PowerManager; import android.os.Process; import android.platform.test.flag.junit.CheckFlagsRule; import android.platform.test.flag.junit.DeviceFlagsValueProvider; import android.testing.TestableContext; +import android.view.Display; import android.view.Surface; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -56,6 +60,9 @@ public class VirtualDisplayAdapterTest { private static final int MAX_DEVICES = 3; private static final int MAX_DEVICES_PER_PACKAGE = 2; + private static final float DEFAULT_BRIGHTNESS = 0.34f; + private static final float DIM_BRIGHTNESS = 0.12f; + @Rule public final TestableContext mContext = new TestableContext( InstrumentationRegistry.getInstrumentation().getContext()); @@ -123,6 +130,64 @@ public class VirtualDisplayAdapterTest { } @Test + public void testCreateVirtualDisplay_createDisplayDeviceInfoFromDefaults() { + VirtualDisplayConfig config = new VirtualDisplayConfig.Builder( + "testDisplayName", /* width= */ 640, /* height= */ 480, /* densityDpi= */ 240) + .build(); + + final String packageName = "testpackage"; + final String displayUniqueId = VirtualDisplayAdapter.generateDisplayUniqueId( + packageName, Process.myUid(), config); + + DisplayDevice displayDevice = mAdapter.createVirtualDisplayLocked( + mMockCallback, /* projection= */ null, /* ownerUid= */ 10, + packageName, displayUniqueId, /* surface= */ null, /* flags= */ 0, config); + + assertNotNull(displayDevice); + DisplayDeviceInfo info = displayDevice.getDisplayDeviceInfoLocked(); + assertNotNull(info); + + assertThat(info.width).isEqualTo(640); + assertThat(info.height).isEqualTo(480); + assertThat(info.densityDpi).isEqualTo(240); + assertThat(info.xDpi).isEqualTo(240); + assertThat(info.yDpi).isEqualTo(240); + assertThat(info.name).isEqualTo("testDisplayName"); + assertThat(info.uniqueId).isEqualTo(displayUniqueId); + assertThat(info.ownerPackageName).isEqualTo(packageName); + assertThat(info.ownerUid).isEqualTo(10); + assertThat(info.type).isEqualTo(Display.TYPE_VIRTUAL); + assertThat(info.brightnessMinimum).isEqualTo(PowerManager.BRIGHTNESS_MIN); + assertThat(info.brightnessMaximum).isEqualTo(PowerManager.BRIGHTNESS_MAX); + assertThat(info.brightnessDefault).isEqualTo(PowerManager.BRIGHTNESS_MIN); + assertThat(info.brightnessDim).isEqualTo(PowerManager.BRIGHTNESS_INVALID); + } + + @Test + public void testCreateVirtualDisplay_createDisplayDeviceInfoFromVirtualDisplayConfig() { + VirtualDisplayConfig config = new VirtualDisplayConfig.Builder( + "testDisplayName", /* width= */ 640, /* height= */ 480, /* densityDpi= */ 240) + .setDefaultBrightness(DEFAULT_BRIGHTNESS) + .setDimBrightness(DIM_BRIGHTNESS) + .build(); + + final String packageName = "testpackage"; + final String displayUniqueId = VirtualDisplayAdapter.generateDisplayUniqueId( + packageName, Process.myUid(), config); + + DisplayDevice displayDevice = mAdapter.createVirtualDisplayLocked( + mMockCallback, /* projection= */ null, /* ownerUid= */ 10, + packageName, displayUniqueId, /* surface= */ null, /* flags= */ 0, config); + + assertNotNull(displayDevice); + DisplayDeviceInfo info = displayDevice.getDisplayDeviceInfoLocked(); + assertNotNull(info); + + assertThat(info.brightnessDefault).isEqualTo(DEFAULT_BRIGHTNESS); + assertThat(info.brightnessDim).isEqualTo(DIM_BRIGHTNESS); + } + + @Test public void testCreatesVirtualDisplay_checkGeneratedDisplayUniqueIdPrefix() { VirtualDisplayConfig config = new VirtualDisplayConfig.Builder("test", /* width= */ 1, /* height= */ 1, /* densityDpi= */ 1).build(); diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java index 5490a2295c8c..66e9c98b6481 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/BrightnessClamperControllerTest.java @@ -19,6 +19,8 @@ package com.android.server.display.brightness.clamper; import static android.view.Display.STATE_OFF; import static android.view.Display.STATE_ON; +import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -269,6 +271,24 @@ public class BrightnessClamperControllerTest { verify(mMockExternalListener).onChanged(); } + @Test + public void test_doesNotScheduleRecalculateBeforeStart() { + mTestInjector = new TestInjector(List.of()) { + @Override + List<BrightnessStateModifier> getModifiers(DisplayManagerFlags flags, Context context, + Handler handler, BrightnessClamperController.ClamperChangeListener listener, + BrightnessClamperController.DisplayDeviceData displayDeviceData, + float currentBrightness) { + listener.onChanged(); + return super.getModifiers(flags, context, handler, listener, displayDeviceData, + currentBrightness); + } + }; + mClamperController = createBrightnessClamperController(); + + assertThat(mTestHandler.getPendingMessages()).isEmpty(); + } + private BrightnessClamperController createBrightnessClamperController() { return new BrightnessClamperController(mTestInjector, mTestHandler, mMockExternalListener, mMockDisplayDeviceData, mMockContext, mFlags, mSensorManager, 0); diff --git a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/DisplayDimModifierTest.java b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/DisplayDimModifierTest.java index be4e7c7a9edd..7e4042ed2d05 100644 --- a/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/DisplayDimModifierTest.java +++ b/services/tests/displayservicetests/src/com/android/server/display/brightness/clamper/DisplayDimModifierTest.java @@ -44,6 +44,8 @@ public class DisplayDimModifierTest { private static final float MIN_DIM_AMOUNT = 0.05f; private static final float DIM_CONFIG = 0.4f; + private static final int DISPLAY_ID = 3; + @Mock private Context mMockContext; @@ -66,9 +68,9 @@ public class DisplayDimModifierTest { R.dimen.config_screenBrightnessMinimumDimAmountFloat)).thenReturn(MIN_DIM_AMOUNT); when(mMockContext.getSystemService(PowerManager.class)).thenReturn(mMockPowerManager); when(mMockPowerManager.getBrightnessConstraint( - PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DIM)).thenReturn(DIM_CONFIG); + DISPLAY_ID, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DIM)).thenReturn(DIM_CONFIG); - mModifier = new DisplayDimModifier(mMockContext); + mModifier = new DisplayDimModifier(DISPLAY_ID, mMockContext); mRequest.policy = DisplayManagerInternal.DisplayPowerRequest.POLICY_DIM; } diff --git a/services/tests/mockingservicestests/src/com/android/server/location/fudger/LocationFudgerCacheTest.java b/services/tests/mockingservicestests/src/com/android/server/location/fudger/LocationFudgerCacheTest.java index 04b82c4890af..6b7eda26b945 100644 --- a/services/tests/mockingservicestests/src/com/android/server/location/fudger/LocationFudgerCacheTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/location/fudger/LocationFudgerCacheTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -226,8 +227,8 @@ public class LocationFudgerCacheTest { cache.getCoarseningLevel(POINT_IN_TIMES_SQUARE[0], POINT_IN_TIMES_SQUARE[1]); - verify(provider).getCoarsenedS2Cell(eq(POINT_IN_TIMES_SQUARE[0]), - eq(POINT_IN_TIMES_SQUARE[1]), any()); + verify(provider).getCoarsenedS2Cells(eq(POINT_IN_TIMES_SQUARE[0]), + eq(POINT_IN_TIMES_SQUARE[1]), anyInt(), any()); } @Test @@ -242,8 +243,8 @@ public class LocationFudgerCacheTest { ArgumentCaptor<IS2CellIdsCallback> argumentCaptor = ArgumentCaptor.forClass( IS2CellIdsCallback.class); - verify(provider).getCoarsenedS2Cell(eq(POINT_IN_TIMES_SQUARE[0]), - eq(POINT_IN_TIMES_SQUARE[1]), argumentCaptor.capture()); + verify(provider).getCoarsenedS2Cells(eq(POINT_IN_TIMES_SQUARE[0]), + eq(POINT_IN_TIMES_SQUARE[1]), anyInt(), argumentCaptor.capture()); // Results from the proxy should set the cache int expectedLevel = 4; @@ -264,10 +265,23 @@ public class LocationFudgerCacheTest { cache.addToCache(TIMES_SQUARE_S2_ID); - verify(provider, never()).getCoarsenedS2Cell(anyDouble(), anyDouble(), any()); + verify(provider, never()).getCoarsenedS2Cells(anyDouble(), anyDouble(), anyInt(), any()); } @Test + public void locationFudgerCache_whenQueryIsCached_askForMaxCacheSizeElems() { + ProxyPopulationDensityProvider provider = mock(ProxyPopulationDensityProvider.class); + LocationFudgerCache cache = new LocationFudgerCache(provider); + int numAdditionalCells = cache.MAX_CACHE_SIZE - 1; + + cache.getCoarseningLevel(POINT_IN_TIMES_SQUARE[0], POINT_IN_TIMES_SQUARE[1]); + + verify(provider).getCoarsenedS2Cells(eq(POINT_IN_TIMES_SQUARE[0]), + eq(POINT_IN_TIMES_SQUARE[1]), eq(numAdditionalCells), any()); + } + + + @Test public void locationFudgerCache_canContainUpToMaxSizeItems() { // This test has two sequences of arrange-act-assert. // The first checks that the cache correctly store up to MAX_CACHE_SIZE items. diff --git a/services/tests/mockingservicestests/src/com/android/server/location/fudger/LocationFudgerTest.java b/services/tests/mockingservicestests/src/com/android/server/location/fudger/LocationFudgerTest.java index d58e772f991d..835705d49e6e 100644 --- a/services/tests/mockingservicestests/src/com/android/server/location/fudger/LocationFudgerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/location/fudger/LocationFudgerTest.java @@ -188,8 +188,8 @@ public class LocationFudgerTest { } @Test - public void testDensityBasedCoarsening_ifFeatureIsEnabledButNotDefault_cacheIsNotUsed() { - mSetFlagsRule.disableFlags(Flags.FLAG_DENSITY_BASED_COARSE_LOCATIONS); + public void testDensityBasedCoarsening_ifFeatureIsEnabledButNoDefaultValue_cacheIsNotUsed() { + mSetFlagsRule.enableFlags(Flags.FLAG_DENSITY_BASED_COARSE_LOCATIONS); LocationFudgerCache cache = mock(LocationFudgerCache.class); doReturn(false).when(cache).hasDefaultValue(); diff --git a/services/tests/mockingservicestests/src/com/android/server/location/provider/LocationProviderManagerTest.java b/services/tests/mockingservicestests/src/com/android/server/location/provider/LocationProviderManagerTest.java index cd1990407806..6d78defe2943 100644 --- a/services/tests/mockingservicestests/src/com/android/server/location/provider/LocationProviderManagerTest.java +++ b/services/tests/mockingservicestests/src/com/android/server/location/provider/LocationProviderManagerTest.java @@ -1448,7 +1448,7 @@ public class LocationProviderManagerTest { Location test = new Location("any-provider"); mManager.getPermittedLocation(test, PERMISSION_COARSE); - verify(provider, never()).getCoarsenedS2Cell(anyDouble(), anyDouble(), any()); + verify(provider, never()).getCoarsenedS2Cells(anyDouble(), anyDouble(), anyInt(), any()); } @Test @@ -1472,7 +1472,7 @@ public class LocationProviderManagerTest { Location test = new Location("any-provider"); mManager.getPermittedLocation(test, PERMISSION_COARSE); - verify(provider, never()).getCoarsenedS2Cell(anyDouble(), anyDouble(), any()); + verify(provider, never()).getCoarsenedS2Cells(anyDouble(), anyDouble(), anyInt(), any()); } @Test @@ -1499,7 +1499,7 @@ public class LocationProviderManagerTest { // We can't test that 10.0, 20.0 was passed due to the offset. We only test that a call // happened. - verify(provider).getCoarsenedS2Cell(anyDouble(), anyDouble(), any()); + verify(provider).getCoarsenedS2Cells(anyDouble(), anyDouble(), anyInt(), any()); } @MediumTest diff --git a/services/tests/performancehinttests/src/com/android/server/power/hint/HintManagerServiceTest.java b/services/tests/performancehinttests/src/com/android/server/power/hint/HintManagerServiceTest.java index 313c01d5ce58..7248833d876c 100644 --- a/services/tests/performancehinttests/src/com/android/server/power/hint/HintManagerServiceTest.java +++ b/services/tests/performancehinttests/src/com/android/server/power/hint/HintManagerServiceTest.java @@ -58,6 +58,7 @@ import android.hardware.power.GpuHeadroomResult; import android.hardware.power.IPower; import android.hardware.power.SessionConfig; import android.hardware.power.SessionTag; +import android.hardware.power.SupportInfo; import android.hardware.power.WorkDuration; import android.os.Binder; import android.os.CpuHeadroomParamsInternal; @@ -159,6 +160,7 @@ public class HintManagerServiceTest { private HintManagerService mService; private ChannelConfig mConfig; + private SupportInfo mSupportInfo; private static Answer<Long> fakeCreateWithConfig(Long ptr, Long sessionId) { return new Answer<Long>() { @@ -179,6 +181,12 @@ public class HintManagerServiceTest { mConfig.eventFlagDescriptor = new MQDescriptor<Byte, Byte>(); ApplicationInfo applicationInfo = new ApplicationInfo(); applicationInfo.category = ApplicationInfo.CATEGORY_GAME; + mSupportInfo = new SupportInfo(); + mSupportInfo.headroom = new SupportInfo.HeadroomSupportInfo(); + mSupportInfo.headroom.isCpuSupported = true; + mSupportInfo.headroom.cpuMinIntervalMillis = 2000; + mSupportInfo.headroom.isGpuSupported = true; + mSupportInfo.headroom.gpuMinIntervalMillis = 2000; when(mContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getNameForUid(anyInt())).thenReturn(TEST_APP_NAME); when(mMockPackageManager.getApplicationInfo(eq(TEST_APP_NAME), anyInt())) @@ -205,6 +213,7 @@ public class HintManagerServiceTest { SESSION_IDS[2])); when(mIPowerMock.getInterfaceVersion()).thenReturn(6); + when(mIPowerMock.getSupportInfo()).thenReturn(mSupportInfo); when(mIPowerMock.getSessionChannel(anyInt(), anyInt())).thenReturn(mConfig); LocalServices.removeServiceForTest(ActivityManagerInternal.class); LocalServices.addService(ActivityManagerInternal.class, mAmInternalMock); @@ -1247,28 +1256,22 @@ public class HintManagerServiceTest { @Test public void testCpuHeadroomCache() throws Exception { - when(mIPowerMock.getCpuHeadroomMinIntervalMillis()).thenReturn(2000L); CpuHeadroomParamsInternal params1 = new CpuHeadroomParamsInternal(); CpuHeadroomParams halParams1 = new CpuHeadroomParams(); halParams1.calculationType = CpuHeadroomParams.CalculationType.MIN; - halParams1.selectionType = CpuHeadroomParams.SelectionType.ALL; halParams1.tids = new int[]{Process.myPid()}; CpuHeadroomParamsInternal params2 = new CpuHeadroomParamsInternal(); params2.usesDeviceHeadroom = true; params2.calculationType = CpuHeadroomParams.CalculationType.MIN; - params2.selectionType = CpuHeadroomParams.SelectionType.PER_CORE; CpuHeadroomParams halParams2 = new CpuHeadroomParams(); halParams2.calculationType = CpuHeadroomParams.CalculationType.MIN; - halParams2.selectionType = CpuHeadroomParams.SelectionType.PER_CORE; halParams2.tids = new int[]{}; CpuHeadroomParamsInternal params3 = new CpuHeadroomParamsInternal(); params3.calculationType = CpuHeadroomParams.CalculationType.AVERAGE; - params3.selectionType = CpuHeadroomParams.SelectionType.ALL; CpuHeadroomParams halParams3 = new CpuHeadroomParams(); halParams3.calculationType = CpuHeadroomParams.CalculationType.AVERAGE; - halParams3.selectionType = CpuHeadroomParams.SelectionType.ALL; halParams3.tids = new int[]{Process.myPid()}; // this params should not be cached as the window is not default @@ -1276,15 +1279,14 @@ public class HintManagerServiceTest { params4.calculationWindowMillis = 123; CpuHeadroomParams halParams4 = new CpuHeadroomParams(); halParams4.calculationType = CpuHeadroomParams.CalculationType.MIN; - halParams4.selectionType = CpuHeadroomParams.SelectionType.ALL; halParams4.calculationWindowMillis = 123; halParams4.tids = new int[]{Process.myPid()}; float headroom1 = 0.1f; CpuHeadroomResult halRet1 = CpuHeadroomResult.globalHeadroom(headroom1); when(mIPowerMock.getCpuHeadroom(eq(halParams1))).thenReturn(halRet1); - float[] headroom2 = new float[] {0.2f, 0.2f}; - CpuHeadroomResult halRet2 = CpuHeadroomResult.perCoreHeadroom(headroom2); + float headroom2 = 0.2f; + CpuHeadroomResult halRet2 = CpuHeadroomResult.globalHeadroom(headroom2); when(mIPowerMock.getCpuHeadroom(eq(halParams2))).thenReturn(halRet2); float headroom3 = 0.3f; CpuHeadroomResult halRet3 = CpuHeadroomResult.globalHeadroom(headroom3); @@ -1296,8 +1298,6 @@ public class HintManagerServiceTest { HintManagerService service = createService(); clearInvocations(mIPowerMock); - service.getBinderServiceInstance().getCpuHeadroomMinIntervalMillis(); - verify(mIPowerMock, times(0)).getCpuHeadroomMinIntervalMillis(); assertEquals(halRet1, service.getBinderServiceInstance().getCpuHeadroom(params1)); verify(mIPowerMock, times(1)).getCpuHeadroom(eq(halParams1)); assertEquals(halRet2, service.getBinderServiceInstance().getCpuHeadroom(params2)); @@ -1348,7 +1348,6 @@ public class HintManagerServiceTest { @Test public void testGpuHeadroomCache() throws Exception { - when(mIPowerMock.getGpuHeadroomMinIntervalMillis()).thenReturn(2000L); GpuHeadroomParamsInternal params1 = new GpuHeadroomParamsInternal(); GpuHeadroomParams halParams1 = new GpuHeadroomParams(); halParams1.calculationType = GpuHeadroomParams.CalculationType.MIN; @@ -1369,8 +1368,6 @@ public class HintManagerServiceTest { HintManagerService service = createService(); clearInvocations(mIPowerMock); - service.getBinderServiceInstance().getGpuHeadroomMinIntervalMillis(); - verify(mIPowerMock, times(0)).getGpuHeadroomMinIntervalMillis(); assertEquals(halRet1, service.getBinderServiceInstance().getGpuHeadroom(params1)); assertEquals(halRet2, service.getBinderServiceInstance().getGpuHeadroom(params2)); verify(mIPowerMock, times(2)).getGpuHeadroom(any()); diff --git a/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java index b48c2d7f5007..376091e4a241 100644 --- a/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java @@ -1257,6 +1257,36 @@ public class PowerManagerServiceTest { .isEqualTo(WAKEFULNESS_DOZING); } + @EnableFlags({ + android.companion.virtualdevice.flags.Flags.FLAG_DEVICE_AWARE_DISPLAY_POWER, + android.companion.virtualdevice.flags.Flags.FLAG_DISPLAY_POWER_MANAGER_APIS}) + @Test + public void getBrightnessConstraint_valuesMatchDisplayInfo() { + final int displayId = 7; + final DisplayInfo info = new DisplayInfo(); + info.brightnessMinimum = 0.12f; + info.brightnessDim = 0.34f; + info.brightnessDefault = 0.56f; + info.brightnessMaximum = 0.78f; + when(mDisplayManagerInternalMock.getDisplayInfo(displayId)).thenReturn(info); + + createService(); + startSystem(); + + assertThat(mService.getBinderServiceInstance().getBrightnessConstraint( + displayId, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM)) + .isEqualTo(info.brightnessMinimum); + assertThat(mService.getBinderServiceInstance().getBrightnessConstraint( + displayId, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM)) + .isEqualTo(info.brightnessMaximum); + assertThat(mService.getBinderServiceInstance().getBrightnessConstraint( + displayId, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT)) + .isEqualTo(info.brightnessDefault); + assertThat(mService.getBinderServiceInstance().getBrightnessConstraint( + displayId, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DIM)) + .isEqualTo(info.brightnessDim); + } + @SuppressWarnings("GuardedBy") @Test public void testAmbientSuppression_disablesDreamingAndWakesDevice() { diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java index d7b60cffa623..2b152315eec4 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/BatteryExternalStatsWorkerTest.java @@ -39,7 +39,6 @@ import android.hardware.power.stats.StateResidencyResult; import android.os.Handler; import android.os.Looper; import android.os.connectivity.WifiActivityEnergyInfo; -import android.platform.test.ravenwood.RavenwoodConfig; import android.power.PowerStatsInternal; import android.util.IntArray; import android.util.SparseArray; @@ -66,9 +65,6 @@ import java.util.concurrent.CompletableFuture; @SuppressWarnings("GuardedBy") @android.platform.test.annotations.DisabledOnRavenwood public class BatteryExternalStatsWorkerTest { - @RavenwoodConfig.Config - public final RavenwoodConfig mRavenwood = new RavenwoodConfig.Builder().build(); - private BatteryExternalStatsWorker mBatteryExternalStatsWorker; private TestPowerStatsInternal mPowerStatsInternal; private Handler mHandler; diff --git a/services/tests/powerstatstests/src/com/android/server/power/stats/processor/WakelockPowerStatsProcessorTest.java b/services/tests/powerstatstests/src/com/android/server/power/stats/processor/WakelockPowerStatsProcessorTest.java index f64dc083ca1a..ed3cda0f76ef 100644 --- a/services/tests/powerstatstests/src/com/android/server/power/stats/processor/WakelockPowerStatsProcessorTest.java +++ b/services/tests/powerstatstests/src/com/android/server/power/stats/processor/WakelockPowerStatsProcessorTest.java @@ -34,7 +34,6 @@ import static org.mockito.Mockito.mock; import android.os.BatteryConsumer; import android.os.PersistableBundle; import android.os.Process; -import android.platform.test.ravenwood.RavenwoodConfig; import com.android.internal.os.BatteryStatsHistory; import com.android.internal.os.MonotonicClock; @@ -48,11 +47,6 @@ import org.junit.Rule; import org.junit.Test; public class WakelockPowerStatsProcessorTest { - @RavenwoodConfig.Config - public static final RavenwoodConfig sConfig = new RavenwoodConfig.Builder() - .setProvideMainThread(true) - .build(); - @Rule public final BatteryUsageStatsRule mStatsRule = new BatteryUsageStatsRule() .setAveragePower(PowerProfile.POWER_CPU_IDLE, 720); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java index ac535b35cdfd..a2965b3c51f1 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -138,10 +138,12 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.AdditionalAnswers; import org.mockito.ArgumentCaptor; import org.mockito.ArgumentMatchers; import org.mockito.Captor; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.mockito.internal.util.reflection.FieldReader; @@ -259,6 +261,11 @@ public class AccessibilityManagerServiceTest { mMockA11yController); when(mMockA11yController.isAccessibilityTracingEnabled()).thenReturn(false); when(mMockUserManagerInternal.isUserUnlockingOrUnlocked(anyInt())).thenReturn(true); + when(mMockSecurityPolicy.resolveCallingUserIdEnforcingPermissionsLocked(anyInt())) + .then(AdditionalAnswers.returnsFirstArg()); + when(mMockSecurityPolicy.resolveCallingUserIdEnforcingPermissionsLocked( + eq(UserHandle.USER_CURRENT))) + .thenReturn(mTestableContext.getUserId()); final ArrayList<Display> displays = new ArrayList<>(); final Display defaultDisplay = new Display(DisplayManagerGlobal.getInstance(), @@ -282,14 +289,21 @@ public class AccessibilityManagerServiceTest { mInputFilter, mProxyManager, mFakePermissionEnforcer); + mA11yms.switchUser(mTestableContext.getUserId()); + mTestableLooper.processAllMessages(); + FieldSetter.setField(mA11yms, + AccessibilityManagerService.class.getDeclaredField("mHasInputFilter"), true); + FieldSetter.setField(mA11yms, + AccessibilityManagerService.class.getDeclaredField("mInputFilter"), mInputFilter); final AccessibilityUserState userState = new AccessibilityUserState( - mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); - mA11yms.mUserStates.put(mA11yms.getCurrentUserIdLocked(), userState); + mTestableContext.getUserId(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); AccessibilityManager am = mTestableContext.getSystemService(AccessibilityManager.class); mA11yManagerServiceOnDevice = (IAccessibilityManager) new FieldReader(am, AccessibilityManager.class.getDeclaredField("mService")).read(); FieldSetter.setField(am, AccessibilityManager.class.getDeclaredField("mService"), mA11yms); + Mockito.clearInvocations(mMockMagnificationConnectionManager); } @After @@ -652,7 +666,6 @@ public class AccessibilityManagerServiceTest { mA11yms.getCurrentUserIdLocked()); userState.setMagnificationCapabilitiesLocked( ACCESSIBILITY_MAGNIFICATION_MODE_ALL); - //userState.setMagnificationSingleFingerTripleTapEnabledLocked(false); userState.setMagnificationSingleFingerTripleTapEnabledLocked(false); // Invokes client change to trigger onUserStateChanged. @@ -1025,6 +1038,7 @@ public class AccessibilityManagerServiceTest { when(mMockSecurityPolicy.canRegisterService(any())).thenReturn(true); mA11yms.switchUser(mA11yms.getCurrentUserIdLocked() + 1); + mTestableLooper.processAllMessages(); assertThat(lockState.get()).containsExactly(false); } @@ -1114,9 +1128,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_enableSoftwareShortcut_shortcutTurnedOn() throws Exception { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); mFakePermissionEnforcer.grant(Manifest.permission.MANAGE_ACCESSIBILITY); setupShortcutTargetServices(); String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString(); @@ -1135,9 +1146,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableHardwareShortcutsForTargets_shortcutDialogSetting_isShown() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); Settings.Secure.putInt( mTestableContext.getContentResolver(), Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, @@ -1165,9 +1173,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_disableSoftwareShortcut_shortcutTurnedOff() throws Exception { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); String target = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString(); enableShortcutsForTargets_enableSoftwareShortcut_shortcutTurnedOn(); @@ -1185,9 +1190,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_enableSoftwareShortcutWithMagnification_menuSizeIncreased() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); mFakePermissionEnforcer.grant(Manifest.permission.MANAGE_ACCESSIBILITY); mA11yms.enableShortcutsForTargets( @@ -1231,9 +1233,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_enableAlwaysOnServiceSoftwareShortcut_turnsOnAlwaysOnService() throws Exception { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); mFakePermissionEnforcer.grant(Manifest.permission.MANAGE_ACCESSIBILITY); setupShortcutTargetServices(); @@ -1254,9 +1253,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_disableAlwaysOnServiceSoftwareShortcut_turnsOffAlwaysOnService() throws Exception { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); enableShortcutsForTargets_enableAlwaysOnServiceSoftwareShortcut_turnsOnAlwaysOnService(); mA11yms.enableShortcutsForTargets( @@ -1296,9 +1292,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_disableStandardServiceSoftwareShortcutWithServiceOn_wontTurnOffService() throws Exception { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); enableShortcutsForTargets_enableStandardServiceSoftwareShortcut_wontTurnOnService(); AccessibilityUtils.setAccessibilityServiceState( mTestableContext, TARGET_STANDARD_A11Y_SERVICE, /* enabled= */ true); @@ -1319,9 +1312,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_enableTripleTapShortcut_settingUpdated() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); mFakePermissionEnforcer.grant(Manifest.permission.MANAGE_ACCESSIBILITY); mA11yms.enableShortcutsForTargets( @@ -1341,9 +1331,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_disableTripleTapShortcut_settingUpdated() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); enableShortcutsForTargets_enableTripleTapShortcut_settingUpdated(); mA11yms.enableShortcutsForTargets( @@ -1362,9 +1349,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_enableMultiFingerMultiTapsShortcut_settingUpdated() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); mFakePermissionEnforcer.grant(Manifest.permission.MANAGE_ACCESSIBILITY); mA11yms.enableShortcutsForTargets( @@ -1384,9 +1368,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_disableMultiFingerMultiTapsShortcut_settingUpdated() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); enableShortcutsForTargets_enableMultiFingerMultiTapsShortcut_settingUpdated(); mA11yms.enableShortcutsForTargets( @@ -1406,9 +1387,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_enableVolumeKeysShortcut_shortcutSet() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); mFakePermissionEnforcer.grant(Manifest.permission.MANAGE_ACCESSIBILITY); setupShortcutTargetServices(); @@ -1428,9 +1406,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_disableVolumeKeysShortcut_shortcutNotSet() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); enableShortcutsForTargets_enableVolumeKeysShortcut_shortcutSet(); mA11yms.enableShortcutsForTargets( @@ -1450,9 +1425,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_enableQuickSettings_shortcutSet() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); mFakePermissionEnforcer.grant(Manifest.permission.MANAGE_ACCESSIBILITY); setupShortcutTargetServices(); @@ -1478,9 +1450,6 @@ public class AccessibilityManagerServiceTest { @Test public void enableShortcutsForTargets_disableQuickSettings_shortcutNotSet() { - // TODO(b/111889696): Remove the user 0 assumption once we support multi-user - assumeTrue("The test is setup to run as a user 0", - isSameCurrentUser(mA11yms, mTestableContext)); enableShortcutsForTargets_enableQuickSettings_shortcutSet(); mA11yms.enableShortcutsForTargets( @@ -1684,14 +1653,17 @@ public class AccessibilityManagerServiceTest { @Test @EnableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT) public void restoreShortcutTargets_qs_a11yQsTargetsRestored() { + // TODO: remove the assumption when we fix b/381294327 + assumeTrue("The test is setup to run as a user 0", + mTestableContext.getUserId() == UserHandle.USER_SYSTEM); String daltonizerTile = AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME.flattenToString(); String colorInversionTile = AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME.flattenToString(); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); userState.updateShortcutTargetsLocked(Set.of(daltonizerTile), QUICK_SETTINGS); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.mUserStates.put(userState.mUserId, userState); broadcastSettingRestored( ShortcutUtils.convertToKey(QUICK_SETTINGS), @@ -1707,15 +1679,18 @@ public class AccessibilityManagerServiceTest { @Test @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT) public void restoreShortcutTargets_qs_a11yQsTargetsNotRestored() { + // TODO: remove the assumption when we fix b/381294327 + assumeTrue("The test is setup to run as a user 0", + mTestableContext.getUserId() == UserHandle.USER_SYSTEM); String daltonizerTile = AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME.flattenToString(); String colorInversionTile = AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME.flattenToString(); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); userState.updateShortcutTargetsLocked(Set.of(daltonizerTile), QUICK_SETTINGS); putShortcutSettingForUser(QUICK_SETTINGS, daltonizerTile, userState.mUserId); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.mUserStates.put(userState.mUserId, userState); broadcastSettingRestored( ShortcutUtils.convertToKey(QUICK_SETTINGS), @@ -1739,13 +1714,13 @@ public class AccessibilityManagerServiceTest { ComponentName::getPackageName).toList().toArray(new String[0]); PackageMonitor monitor = spy(mA11yms.getPackageMonitor()); - when(monitor.getChangingUserId()).thenReturn(UserHandle.USER_SYSTEM); + when(monitor.getChangingUserId()).thenReturn(userState.mUserId); mA11yms.setPackageMonitor(monitor); assertTrue(mA11yms.getPackageMonitor().onHandleForceStop( new Intent(), packages, - UserHandle.USER_SYSTEM, + userState.mUserId, false )); } @@ -1761,13 +1736,13 @@ public class AccessibilityManagerServiceTest { ComponentName::getPackageName).toList().toArray(new String[0]); PackageMonitor monitor = spy(mA11yms.getPackageMonitor()); - when(monitor.getChangingUserId()).thenReturn(UserHandle.USER_SYSTEM); + when(monitor.getChangingUserId()).thenReturn(userState.mUserId); mA11yms.setPackageMonitor(monitor); assertFalse(mA11yms.getPackageMonitor().onHandleForceStop( new Intent(), packages, - UserHandle.USER_SYSTEM, + userState.mUserId, true )); } @@ -1775,27 +1750,29 @@ public class AccessibilityManagerServiceTest { @Test public void onHandleForceStop_dontDoIt_packageNotEnabled_returnsFalse() { PackageMonitor monitor = spy(mA11yms.getPackageMonitor()); - when(monitor.getChangingUserId()).thenReturn(UserHandle.USER_SYSTEM); + when(monitor.getChangingUserId()).thenReturn(mA11yms.getCurrentUserIdLocked()); mA11yms.setPackageMonitor(monitor); assertFalse(mA11yms.getPackageMonitor().onHandleForceStop( new Intent(), new String[]{"FOO", "BAR"}, - UserHandle.USER_SYSTEM, + mA11yms.getCurrentUserIdLocked(), false )); } @Test - @EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE) public void restoreShortcutTargets_hardware_targetsMerged() { + // TODO: remove the assumption when we fix b/381294327 + assumeTrue("The test is setup to run as a user 0", + mTestableContext.getUserId() == UserHandle.USER_SYSTEM); mFakePermissionEnforcer.grant(Manifest.permission.MANAGE_ACCESSIBILITY); final String servicePrevious = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString(); final String otherPrevious = TARGET_MAGNIFICATION; final String serviceRestored = TARGET_STANDARD_A11Y_SERVICE_NAME; final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); mA11yms.enableShortcutsForTargets( true, HARDWARE, List.of(servicePrevious, otherPrevious), userState.mUserId); @@ -1812,18 +1789,20 @@ public class AccessibilityManagerServiceTest { } @Test - @EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE) public void restoreShortcutTargets_hardware_alreadyHadDefaultService_doesNotClear() { + // TODO: remove the assumption when we fix b/381294327 + assumeTrue("The test is setup to run as a user 0", + mTestableContext.getUserId() == UserHandle.USER_SYSTEM); final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME; mTestableContext.getOrCreateTestableResources().addOverride( R.string.config_defaultAccessibilityService, serviceDefault); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); // default is present in userState & setting, so it's not cleared - putShortcutSettingForUser(HARDWARE, serviceDefault, UserHandle.USER_SYSTEM); + putShortcutSettingForUser(HARDWARE, serviceDefault, userState.mUserId); userState.updateShortcutTargetsLocked(Set.of(serviceDefault), HARDWARE); broadcastSettingRestored( @@ -1838,8 +1817,10 @@ public class AccessibilityManagerServiceTest { } @Test - @EnableFlags(android.view.accessibility.Flags.FLAG_RESTORE_A11Y_SHORTCUT_TARGET_SERVICE) public void restoreShortcutTargets_hardware_didNotHaveDefaultService_clearsDefaultService() { + // TODO: remove the assumption when we fix b/381294327 + assumeTrue("The test is setup to run as a user 0", + mTestableContext.getUserId() == UserHandle.USER_SYSTEM); final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME; final String serviceRestored = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString(); // Restored value from the broadcast contains both default and non-default service. @@ -1847,8 +1828,8 @@ public class AccessibilityManagerServiceTest { mTestableContext.getOrCreateTestableResources().addOverride( R.string.config_defaultAccessibilityService, serviceDefault); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); broadcastSettingRestored(ShortcutUtils.convertToKey(HARDWARE), @@ -1863,8 +1844,10 @@ public class AccessibilityManagerServiceTest { } @Test - @EnableFlags(Flags.FLAG_CLEAR_DEFAULT_FROM_A11Y_SHORTCUT_TARGET_SERVICE_RESTORE) public void restoreShortcutTargets_hardware_nullSetting_clearsDefaultService() { + // TODO: remove the assumption when we fix b/381294327 + assumeTrue("The test is setup to run as a user 0", + mTestableContext.getUserId() == UserHandle.USER_SYSTEM); final String serviceDefault = TARGET_STANDARD_A11Y_SERVICE_NAME; final String serviceRestored = TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString(); // Restored value from the broadcast contains both default and non-default service. @@ -1872,13 +1855,13 @@ public class AccessibilityManagerServiceTest { mTestableContext.getOrCreateTestableResources().addOverride( R.string.config_defaultAccessibilityService, serviceDefault); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); // UserState has default, but setting is null (this emulates a typical scenario in SUW). userState.updateShortcutTargetsLocked(Set.of(serviceDefault), HARDWARE); - putShortcutSettingForUser(HARDWARE, null, UserHandle.USER_SYSTEM); + putShortcutSettingForUser(HARDWARE, null, userState.mUserId); broadcastSettingRestored(ShortcutUtils.convertToKey(HARDWARE), /*newValue=*/combinedRestored); @@ -1896,8 +1879,8 @@ public class AccessibilityManagerServiceTest { public void onNavButtonNavigation_migratesGestureTargets() { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); userState.updateShortcutTargetsLocked( Set.of(TARGET_STANDARD_A11Y_SERVICE_NAME), SOFTWARE); @@ -1920,20 +1903,20 @@ public class AccessibilityManagerServiceTest { public void onNavButtonNavigation_gestureTargets_noButtonTargets_navBarButtonMode() { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); userState.updateShortcutTargetsLocked(Set.of(), SOFTWARE); userState.updateShortcutTargetsLocked( Set.of(TARGET_ALWAYS_ON_A11Y_SERVICE.flattenToString()), GESTURE); ShortcutUtils.setButtonMode( - mTestableContext, ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU, UserHandle.USER_SYSTEM); + mTestableContext, ACCESSIBILITY_BUTTON_MODE_FLOATING_MENU, userState.mUserId); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_3BUTTON, userState.mUserId); mA11yms.updateShortcutsForCurrentNavigationMode(); - assertThat(ShortcutUtils.getButtonMode(mTestableContext, UserHandle.USER_SYSTEM)) + assertThat(ShortcutUtils.getButtonMode(mTestableContext, userState.mUserId)) .isEqualTo(ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR); } @@ -1942,11 +1925,11 @@ public class AccessibilityManagerServiceTest { public void onGestureNavigation_floatingMenuMode() { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); ShortcutUtils.setButtonMode( - mTestableContext, ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR, UserHandle.USER_SYSTEM); + mTestableContext, ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR, userState.mUserId); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, userState.mUserId); @@ -1961,8 +1944,8 @@ public class AccessibilityManagerServiceTest { public void onNavigation_revertGestureTargets() { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); userState.updateShortcutTargetsLocked( Set.of(TARGET_STANDARD_A11Y_SERVICE_NAME), SOFTWARE); @@ -1985,8 +1968,8 @@ public class AccessibilityManagerServiceTest { public void onNavigation_gestureNavigation_gestureButtonMode_migratesTargetsToGesture() { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); userState.updateShortcutTargetsLocked(Set.of( TARGET_STANDARD_A11Y_SERVICE_NAME, @@ -1994,7 +1977,7 @@ public class AccessibilityManagerServiceTest { userState.updateShortcutTargetsLocked(Set.of(), GESTURE); ShortcutUtils.setButtonMode( - mTestableContext, ACCESSIBILITY_BUTTON_MODE_GESTURE, UserHandle.USER_SYSTEM); + mTestableContext, ACCESSIBILITY_BUTTON_MODE_GESTURE, userState.mUserId); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, userState.mUserId); mA11yms.updateShortcutsForCurrentNavigationMode(); @@ -2010,11 +1993,11 @@ public class AccessibilityManagerServiceTest { @DisableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED) public void onNavigation_gestureNavigation_correctsButtonMode() { final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); ShortcutUtils.setButtonMode( - mTestableContext, ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR, UserHandle.USER_SYSTEM); + mTestableContext, ACCESSIBILITY_BUTTON_MODE_NAVIGATION_BAR, userState.mUserId); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, userState.mUserId); @@ -2028,11 +2011,11 @@ public class AccessibilityManagerServiceTest { @DisableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED) public void onNavigation_navBarNavigation_correctsButtonMode() { final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); setupShortcutTargetServices(userState); ShortcutUtils.setButtonMode( - mTestableContext, ACCESSIBILITY_BUTTON_MODE_GESTURE, UserHandle.USER_SYSTEM); + mTestableContext, ACCESSIBILITY_BUTTON_MODE_GESTURE, userState.mUserId); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_3BUTTON, userState.mUserId); @@ -2046,8 +2029,8 @@ public class AccessibilityManagerServiceTest { public void showAccessibilityTargetSelection_navBarNavigationMode_softwareExtra() { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_3BUTTON, userState.mUserId); @@ -2062,8 +2045,8 @@ public class AccessibilityManagerServiceTest { public void showAccessibilityTargetSelection_gestureNavigationMode_softwareExtra() { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, userState.mUserId); @@ -2078,8 +2061,8 @@ public class AccessibilityManagerServiceTest { public void showAccessibilityTargetSelection_gestureNavigationMode_gestureExtra() { mFakePermissionEnforcer.grant(Manifest.permission.STATUS_BAR_SERVICE); final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, userState.mUserId); @@ -2113,18 +2096,19 @@ public class AccessibilityManagerServiceTest { public void switchUser_callsUserInitializationCompleteCallback() throws RemoteException { mA11yms.mUserInitializationCompleteCallbacks.add(mUserInitializationCompleteCallback); - mA11yms.switchUser(UserHandle.MIN_SECONDARY_USER_ID); + int newUserId = mA11yms.getCurrentUserIdLocked() + 1; + mA11yms.switchUser(newUserId); + mTestableLooper.processAllMessages(); - verify(mUserInitializationCompleteCallback).onUserInitializationComplete( - UserHandle.MIN_SECONDARY_USER_ID); + verify(mUserInitializationCompleteCallback).onUserInitializationComplete(newUserId); } @Test @DisableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED) public void getShortcutTypeForGenericShortcutCalls_softwareType() { final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); assertThat(mA11yms.getShortcutTypeForGenericShortcutCalls(userState.mUserId)) .isEqualTo(SOFTWARE); @@ -2134,8 +2118,8 @@ public class AccessibilityManagerServiceTest { @EnableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED) public void getShortcutTypeForGenericShortcutCalls_gestureNavigationMode_gestureType() { final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_GESTURAL, userState.mUserId); @@ -2147,8 +2131,8 @@ public class AccessibilityManagerServiceTest { @EnableFlags(android.provider.Flags.FLAG_A11Y_STANDALONE_GESTURE_ENABLED) public void getShortcutTypeForGenericShortcutCalls_buttonNavigationMode_softwareType() { final AccessibilityUserState userState = new AccessibilityUserState( - UserHandle.USER_SYSTEM, mTestableContext, mA11yms); - mA11yms.mUserStates.put(UserHandle.USER_SYSTEM, userState); + mA11yms.getCurrentUserIdLocked(), mTestableContext, mA11yms); + mA11yms.mUserStates.put(userState.mUserId, userState); Settings.Secure.putIntForUser(mTestableContext.getContentResolver(), NAVIGATION_MODE, NAV_BAR_MODE_3BUTTON, userState.mUserId); @@ -2339,13 +2323,13 @@ public class AccessibilityManagerServiceTest { private Set<String> readStringsFromSetting(String setting) { final Set<String> result = new ArraySet<>(); mA11yms.readColonDelimitedSettingToSet( - setting, UserHandle.USER_SYSTEM, str -> str, result); + setting, mA11yms.getCurrentUserIdLocked(), str -> str, result); return result; } private void writeStringsToSetting(Set<String> strings, String setting) { mA11yms.persistColonDelimitedSetToSettingLocked( - setting, UserHandle.USER_SYSTEM, strings, str -> str); + setting, mA11yms.getCurrentUserIdLocked(), strings, str -> str); } private void broadcastSettingRestored(String setting, String newValue) { @@ -2516,10 +2500,6 @@ public class AccessibilityManagerServiceTest { } } - private static boolean isSameCurrentUser(AccessibilityManagerService service, Context context) { - return service.getCurrentUserIdLocked() == context.getUserId(); - } - private void putShortcutSettingForUser(@UserShortcutType int shortcutType, String shortcutValue, int userId) { Settings.Secure.putStringForUser( diff --git a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java index 9cd3186f99f3..605fed09dd9f 100644 --- a/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/biometrics/AuthServiceTest.java @@ -38,6 +38,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.annotation.UserIdInt; import android.app.AppOpsManager; import android.content.Context; import android.content.pm.PackageManager; @@ -92,6 +93,8 @@ public class AuthServiceTest { private static final String TEST_OP_PACKAGE_NAME = "test_package"; + private final @UserIdInt int mUserId = UserHandle.getCallingUserId(); + private AuthService mAuthService; @Rule @@ -257,12 +260,11 @@ public class AuthServiceTest { final Binder token = new Binder(); final PromptInfo promptInfo = new PromptInfo(); final long sessionId = 0; - final int userId = 0; mAuthService.mImpl.authenticate( token, sessionId, - userId, + mUserId, mReceiver, TEST_OP_PACKAGE_NAME, promptInfo); @@ -270,7 +272,7 @@ public class AuthServiceTest { verify(mBiometricService).authenticate( eq(token), eq(sessionId), - eq(userId), + eq(mUserId), eq(mReceiver), eq(TEST_OP_PACKAGE_NAME), eq(promptInfo)); @@ -286,12 +288,11 @@ public class AuthServiceTest { final Binder token = new Binder(); final PromptInfo promptInfo = new PromptInfo(); final long sessionId = 0; - final int userId = 0; mAuthService.mImpl.authenticate( token, sessionId, - userId, + mUserId, mReceiver, TEST_OP_PACKAGE_NAME, promptInfo); @@ -299,7 +300,7 @@ public class AuthServiceTest { verify(mBiometricService, never()).authenticate( eq(token), eq(sessionId), - eq(userId), + eq(mUserId), eq(mReceiver), eq(TEST_OP_PACKAGE_NAME), eq(promptInfo)); @@ -313,12 +314,11 @@ public class AuthServiceTest { final PromptInfo promptInfo = new PromptInfo(); final long sessionId = 0; - final int userId = 0; mAuthService.mImpl.authenticate( null /* token */, sessionId, - userId, + mUserId, mReceiver, TEST_OP_PACKAGE_NAME, promptInfo); @@ -338,7 +338,7 @@ public class AuthServiceTest { mAuthService.mImpl.authenticate( token, 0, /* sessionId */ - 0, /* userId */ + mUserId, mReceiver, TEST_OP_PACKAGE_NAME, new PromptInfo()); @@ -356,7 +356,7 @@ public class AuthServiceTest { mAuthService.mImpl.authenticate( token, 0, /* sessionId */ - 0, /* userId */ + mUserId, mReceiver, TEST_OP_PACKAGE_NAME, new PromptInfo()); @@ -414,20 +414,19 @@ public class AuthServiceTest { mAuthService = new AuthService(mContext, mInjector); mAuthService.onStart(); - final int userId = 0; final int expectedResult = BIOMETRIC_SUCCESS; final int authenticators = 0; when(mBiometricService.canAuthenticate(anyString(), anyInt(), anyInt(), anyInt())) .thenReturn(expectedResult); final int result = mAuthService.mImpl - .canAuthenticate(TEST_OP_PACKAGE_NAME, userId, authenticators); + .canAuthenticate(TEST_OP_PACKAGE_NAME, mUserId, authenticators); assertEquals(expectedResult, result); waitForIdle(); verify(mBiometricService).canAuthenticate( eq(TEST_OP_PACKAGE_NAME), - eq(userId), + eq(mUserId), eq(UserHandle.getCallingUserId()), eq(authenticators)); } @@ -440,18 +439,17 @@ public class AuthServiceTest { mAuthService = new AuthService(mContext, mInjector); mAuthService.onStart(); - final int userId = 0; final boolean expectedResult = true; when(mBiometricService.hasEnrolledBiometrics(anyInt(), anyString())).thenReturn( expectedResult); - final boolean result = mAuthService.mImpl.hasEnrolledBiometrics(userId, + final boolean result = mAuthService.mImpl.hasEnrolledBiometrics(mUserId, TEST_OP_PACKAGE_NAME); assertEquals(expectedResult, result); waitForIdle(); verify(mBiometricService).hasEnrolledBiometrics( - eq(userId), + eq(mUserId), eq(TEST_OP_PACKAGE_NAME)); } @@ -528,13 +526,12 @@ public class AuthServiceTest { mAuthService = new AuthService(mContext, mInjector); mAuthService.onStart(); - final int userId = 0; final int authenticators = BiometricManager.Authenticators.BIOMETRIC_STRONG; - mAuthService.mImpl.getLastAuthenticationTime(userId, authenticators); + mAuthService.mImpl.getLastAuthenticationTime(mUserId, authenticators); waitForIdle(); - verify(mBiometricService).getLastAuthenticationTime(eq(userId), eq(authenticators)); + verify(mBiometricService).getLastAuthenticationTime(eq(mUserId), eq(authenticators)); } private static void setInternalAndTestBiometricPermissions( diff --git a/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java b/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java deleted file mode 100644 index fd221185bacf..000000000000 --- a/services/tests/servicestests/src/com/android/server/integrity/AppIntegrityManagerServiceImplTest.java +++ /dev/null @@ -1,295 +0,0 @@ -/* - * Copyright (C) 2019 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.integrity; - -import static android.content.integrity.AppIntegrityManager.EXTRA_STATUS; -import static android.content.integrity.AppIntegrityManager.STATUS_FAILURE; -import static android.content.integrity.AppIntegrityManager.STATUS_SUCCESS; -import static android.content.integrity.InstallerAllowedByManifestFormula.INSTALLER_CERTIFICATE_NOT_EVALUATED; -import static android.content.pm.PackageManager.EXTRA_VERIFICATION_ID; -import static android.content.pm.PackageManager.EXTRA_VERIFICATION_INSTALLER_PACKAGE; -import static android.content.pm.PackageManager.EXTRA_VERIFICATION_INSTALLER_UID; - -import static com.google.common.truth.Truth.assertThat; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.IntentSender; -import android.content.integrity.AppInstallMetadata; -import android.content.integrity.AtomicFormula; -import android.content.integrity.IntegrityFormula; -import android.content.integrity.Rule; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.content.pm.PackageManagerInternal; -import android.content.pm.ParceledListSlice; -import android.content.res.Resources; -import android.net.Uri; -import android.os.Handler; -import android.os.Message; -import android.provider.Settings; - -import androidx.test.InstrumentationRegistry; - -import com.android.internal.R; -import com.android.server.compat.PlatformCompat; -import com.android.server.testutils.TestUtils; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.mockito.ArgumentCaptor; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnit; -import org.mockito.junit.MockitoRule; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; - -/** Unit test for {@link com.android.server.integrity.AppIntegrityManagerServiceImpl} */ -@RunWith(JUnit4.class) -public class AppIntegrityManagerServiceImplTest { - private static final String TEST_APP_PATH = - "AppIntegrityManagerServiceImplTest/AppIntegrityManagerServiceTestApp.apk"; - - private static final String TEST_APP_TWO_CERT_PATH = - "AppIntegrityManagerServiceImplTest/DummyAppTwoCerts.apk"; - - private static final String TEST_APP_SOURCE_STAMP_PATH = - "AppIntegrityManagerServiceImplTest/SourceStampTestApk.apk"; - - private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive"; - private static final String VERSION = "version"; - private static final String TEST_FRAMEWORK_PACKAGE = "com.android.frameworks.servicestests"; - - private static final String PACKAGE_NAME = "com.test.app"; - - private static final long VERSION_CODE = 100; - private static final String INSTALLER = "com.long.random.test.installer.name"; - - // These are obtained by running the test and checking logcat. - private static final String APP_CERT = - "F14CFECF5070874C05D3D2FA98E046BE20BDE02A0DC74BAF6B59C6A0E4C06850"; - // We use SHA256 for package names longer than 32 characters. - private static final String INSTALLER_SHA256 = - "30F41A7CBF96EE736A54DD6DF759B50ED3CC126ABCEF694E167C324F5976C227"; - private static final String SOURCE_STAMP_CERTIFICATE_HASH = - "C6E737809CEF2B08CC6694892215F82A5E8FBC3C2A0F6212770310B90622D2D9"; - - private static final String DUMMY_APP_TWO_CERTS_CERT_1 = - "C0369C2A1096632429DFA8433068AECEAD00BAC337CA92A175036D39CC9AFE94"; - private static final String DUMMY_APP_TWO_CERTS_CERT_2 = - "94366E0A80F3A3F0D8171A15760B88E228CD6E1101F0414C98878724FBE70147"; - - private static final String PLAY_STORE_PKG = "com.android.vending"; - private static final String ADB_INSTALLER = "adb"; - private static final String PLAY_STORE_CERT = "play_store_cert"; - - @org.junit.Rule public MockitoRule mMockitoRule = MockitoJUnit.rule(); - - @Mock PackageManagerInternal mPackageManagerInternal; - @Mock PlatformCompat mPlatformCompat; - @Mock Context mMockContext; - @Mock Resources mMockResources; - @Mock Handler mHandler; - - private final Context mRealContext = InstrumentationRegistry.getTargetContext(); - - private PackageManager mSpyPackageManager; - private File mTestApk; - private File mTestApkTwoCerts; - private File mTestApkSourceStamp; - - // under test - private AppIntegrityManagerServiceImpl mService; - - @Before - public void setup() throws Exception { - mTestApk = File.createTempFile("AppIntegrity", ".apk"); - try (InputStream inputStream = mRealContext.getAssets().open(TEST_APP_PATH)) { - Files.copy(inputStream, mTestApk.toPath(), REPLACE_EXISTING); - } - - mTestApkTwoCerts = File.createTempFile("AppIntegrityTwoCerts", ".apk"); - try (InputStream inputStream = mRealContext.getAssets().open(TEST_APP_TWO_CERT_PATH)) { - Files.copy(inputStream, mTestApkTwoCerts.toPath(), REPLACE_EXISTING); - } - - mTestApkSourceStamp = File.createTempFile("AppIntegritySourceStamp", ".apk"); - try (InputStream inputStream = mRealContext.getAssets().open(TEST_APP_SOURCE_STAMP_PATH)) { - Files.copy(inputStream, mTestApkSourceStamp.toPath(), REPLACE_EXISTING); - } - - mService = - new AppIntegrityManagerServiceImpl( - mMockContext, - mPackageManagerInternal, - mHandler); - - mSpyPackageManager = spy(mRealContext.getPackageManager()); - // setup mocks to prevent NPE - when(mMockContext.getPackageManager()).thenReturn(mSpyPackageManager); - when(mMockContext.getResources()).thenReturn(mMockResources); - when(mMockResources.getStringArray(anyInt())).thenReturn(new String[] {}); - // These are needed to override the Settings.Global.get result. - when(mMockContext.getContentResolver()).thenReturn(mRealContext.getContentResolver()); - setIntegrityCheckIncludesRuleProvider(true); - } - - @After - public void tearDown() throws Exception { - mTestApk.delete(); - mTestApkTwoCerts.delete(); - mTestApkSourceStamp.delete(); - } - - @Test - public void broadcastReceiverRegistration() throws Exception { - allowlistUsAsRuleProvider(); - makeUsSystemApp(); - ArgumentCaptor<IntentFilter> intentFilterCaptor = - ArgumentCaptor.forClass(IntentFilter.class); - - verify(mMockContext).registerReceiver(any(), intentFilterCaptor.capture(), any(), any()); - assertEquals(1, intentFilterCaptor.getValue().countActions()); - assertEquals( - Intent.ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION, - intentFilterCaptor.getValue().getAction(0)); - assertEquals(1, intentFilterCaptor.getValue().countDataTypes()); - assertEquals(PACKAGE_MIME_TYPE, intentFilterCaptor.getValue().getDataType(0)); - } - - @Test - public void handleBroadcast_allow() throws Exception { - allowlistUsAsRuleProvider(); - makeUsSystemApp(); - ArgumentCaptor<BroadcastReceiver> broadcastReceiverCaptor = - ArgumentCaptor.forClass(BroadcastReceiver.class); - verify(mMockContext) - .registerReceiver(broadcastReceiverCaptor.capture(), any(), any(), any()); - Intent intent = makeVerificationIntent(); - - broadcastReceiverCaptor.getValue().onReceive(mMockContext, intent); - runJobInHandler(); - - verify(mPackageManagerInternal) - .setIntegrityVerificationResult( - 1, PackageManagerInternal.INTEGRITY_VERIFICATION_ALLOW); - } - - private void allowlistUsAsRuleProvider() { - Resources mockResources = mock(Resources.class); - when(mockResources.getStringArray(R.array.config_integrityRuleProviderPackages)) - .thenReturn(new String[] {TEST_FRAMEWORK_PACKAGE}); - when(mMockContext.getResources()).thenReturn(mockResources); - } - - private void runJobInHandler() { - ArgumentCaptor<Message> messageCaptor = ArgumentCaptor.forClass(Message.class); - // sendMessageAtTime is the first non-final method in the call chain when "post" is invoked. - verify(mHandler).sendMessageAtTime(messageCaptor.capture(), anyLong()); - messageCaptor.getValue().getCallback().run(); - } - - private void makeUsSystemApp() throws Exception { - makeUsSystemApp(true); - } - - private void makeUsSystemApp(boolean isSystemApp) throws Exception { - PackageInfo packageInfo = - mRealContext.getPackageManager().getPackageInfo(TEST_FRAMEWORK_PACKAGE, 0); - if (isSystemApp) { - packageInfo.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM; - } else { - packageInfo.applicationInfo.flags &= ~ApplicationInfo.FLAG_SYSTEM; - } - doReturn(packageInfo) - .when(mSpyPackageManager) - .getPackageInfo(eq(TEST_FRAMEWORK_PACKAGE), anyInt()); - when(mMockContext.getPackageManager()).thenReturn(mSpyPackageManager); - } - - private Intent makeVerificationIntent() throws Exception { - PackageInfo packageInfo = - mRealContext - .getPackageManager() - .getPackageInfo( - TEST_FRAMEWORK_PACKAGE, PackageManager.GET_SIGNING_CERTIFICATES); - doReturn(packageInfo).when(mSpyPackageManager).getPackageInfo(eq(INSTALLER), anyInt()); - doReturn(1).when(mSpyPackageManager).getPackageUid(eq(INSTALLER), anyInt()); - doReturn(new String[]{INSTALLER}).when(mSpyPackageManager).getPackagesForUid(anyInt()); - return makeVerificationIntent(INSTALLER); - } - - private Intent makeVerificationIntent(String installer) throws Exception { - Intent intent = new Intent(); - intent.setDataAndType(Uri.fromFile(mTestApk), PACKAGE_MIME_TYPE); - intent.setAction(Intent.ACTION_PACKAGE_NEEDS_INTEGRITY_VERIFICATION); - intent.putExtra(EXTRA_VERIFICATION_ID, 1); - intent.putExtra(Intent.EXTRA_PACKAGE_NAME, PACKAGE_NAME); - intent.putExtra(EXTRA_VERIFICATION_INSTALLER_PACKAGE, installer); - intent.putExtra( - EXTRA_VERIFICATION_INSTALLER_UID, - mMockContext.getPackageManager().getPackageUid(installer, /* flags= */ 0)); - intent.putExtra(Intent.EXTRA_LONG_VERSION_CODE, VERSION_CODE); - return intent; - } - - private void setIntegrityCheckIncludesRuleProvider(boolean shouldInclude) throws Exception { - int value = shouldInclude ? 1 : 0; - Settings.Global.putInt( - mRealContext.getContentResolver(), - Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER, - value); - assertThat( - Settings.Global.getInt( - mRealContext.getContentResolver(), - Settings.Global.INTEGRITY_CHECK_INCLUDES_RULE_PROVIDER, - -1) - == 1) - .isEqualTo(shouldInclude); - } -} diff --git a/services/tests/servicestests/src/com/android/server/people/prediction/ShareTargetPredictorTest.java b/services/tests/servicestests/src/com/android/server/people/prediction/ShareTargetPredictorTest.java index fac5c1f94e56..71a05f3b8509 100644 --- a/services/tests/servicestests/src/com/android/server/people/prediction/ShareTargetPredictorTest.java +++ b/services/tests/servicestests/src/com/android/server/people/prediction/ShareTargetPredictorTest.java @@ -40,11 +40,13 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager.ShareShortcutInfo; +import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; import android.provider.DeviceConfig; import android.util.Range; +import com.android.internal.R; import com.android.internal.app.ChooserActivity; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.server.people.data.ConversationInfo; @@ -87,6 +89,7 @@ public final class ShareTargetPredictorTest { private static final IntentFilter INTENT_FILTER = IntentFilter.create("SEND", "text/plain"); @Mock private Context mContext; + @Mock private Resources mResources; @Mock private DataManager mDataManager; @Mock private Consumer<List<AppTarget>> mUpdatePredictionsMethod; @Mock private PackageData mPackageData1; @@ -116,11 +119,14 @@ public final class ShareTargetPredictorTest { when(mDataManager.getShareShortcuts(any(), anyInt())).thenReturn(mShareShortcuts); when(mDataManager.getPackage(PACKAGE_1, USER_ID)).thenReturn(mPackageData1); when(mDataManager.getPackage(PACKAGE_2, USER_ID)).thenReturn(mPackageData2); - when(mContext.createContextAsUser(any(), any())).thenReturn(mContext); + when(mContext.createContextAsUser(any(), anyInt())).thenReturn(mContext); when(mContext.getSystemServiceName(AppPredictionManager.class)).thenReturn( Context.APP_PREDICTION_SERVICE); when(mContext.getSystemService(AppPredictionManager.class)) .thenReturn(new AppPredictionManager(mContext)); + when(mContext.getResources()).thenReturn(mResources); + when(mResources.getString(R.string.config_chooserActivity)) + .thenReturn("com.android.intentresolver/.ChooserActivity"); Bundle bundle = new Bundle(); bundle.putObject(ChooserActivity.APP_PREDICTION_INTENT_FILTER_KEY, INTENT_FILTER); @@ -280,6 +286,25 @@ public final class ShareTargetPredictorTest { } @Test + public void testPredictTargets_emptyIntentFilter() { + Bundle bundle = new Bundle(); + IntentFilter filter = new IntentFilter(); + bundle.putObject(ChooserActivity.APP_PREDICTION_INTENT_FILTER_KEY, filter); + AppPredictionContext predictionContext = new AppPredictionContext.Builder(mContext) + .setUiSurface(UI_SURFACE_SHARE) + .setPredictedTargetCount(NUM_PREDICTED_TARGETS) + .setExtras(bundle) + .build(); + mPredictor = new ShareTargetPredictor( + predictionContext, mUpdatePredictionsMethod, mDataManager, USER_ID, mContext); + + mPredictor.predictTargets(); + + verify(mUpdatePredictionsMethod).accept(mAppTargetCaptor.capture()); + assertThat(mAppTargetCaptor.getValue()).isEmpty(); + } + + @Test public void testPredictTargets_noSharingHistoryRankedByShortcutRank() { mShareShortcuts.add(buildShareShortcut(PACKAGE_1, CLASS_1, "sc1", 3)); mShareShortcuts.add(buildShareShortcut(PACKAGE_1, CLASS_1, "sc2", 2)); diff --git a/services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java index 3b0cb4ad8779..0404b82d306d 100644 --- a/services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/UiModeManagerServiceTest.java @@ -1460,9 +1460,12 @@ public class UiModeManagerServiceTest extends UiServiceTestCase { verify(mInjector).startDreamWhenDockedIfAppropriate(mContext); } - private void testAttentionModeThemeOverlay(boolean modeNight) throws RemoteException { + // Test the attention mode overlay with all the possible attention modes and the initial night + // mode state. Also tests if the attention mode is turned off when the night mode is toggled by + // the user. + private void testAttentionModeThemeOverlay(boolean initialNightMode) throws RemoteException { //setup - if (modeNight) { + if (initialNightMode) { mService.setNightMode(MODE_NIGHT_YES); assertTrue(mUiManagerService.getConfiguration().isNightModeActive()); } else { @@ -1472,21 +1475,29 @@ public class UiModeManagerServiceTest extends UiServiceTestCase { // attention modes with expected night modes Map<Integer, Boolean> modes = Map.of( - MODE_ATTENTION_THEME_OVERLAY_OFF, modeNight, + MODE_ATTENTION_THEME_OVERLAY_OFF, initialNightMode, MODE_ATTENTION_THEME_OVERLAY_DAY, false, MODE_ATTENTION_THEME_OVERLAY_NIGHT, true ); // test - for (int aMode : modes.keySet()) { + for (int attentionMode : modes.keySet()) { try { - mService.setAttentionModeThemeOverlay(aMode); + mService.setAttentionModeThemeOverlay(attentionMode); int appliedAMode = mService.getAttentionModeThemeOverlay(); - boolean nMode = modes.get(aMode); - - assertEquals(aMode, appliedAMode); - assertEquals(isNightModeActivated(), nMode); + boolean expectedNightMode = modes.get(attentionMode); + + assertEquals(attentionMode, appliedAMode); + assertEquals(expectedNightMode, isNightModeActivated()); + + // If attentionMode is active, flip the night mode and assets + // the attention mode is disabled + if (attentionMode != MODE_ATTENTION_THEME_OVERLAY_OFF) { + mService.setNightModeActivated(!expectedNightMode); + assertEquals(MODE_ATTENTION_THEME_OVERLAY_OFF, + mService.getAttentionModeThemeOverlay()); + } } catch (RemoteException e) { fail("Error communicating with server: " + e.getMessage()); } diff --git a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java index bc03c233b459..9db76d47fed7 100644 --- a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java +++ b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java @@ -523,12 +523,12 @@ class TestPhoneWindowManager { } void prepareBrightnessDecrease(float currentBrightness) { - doReturn(0.0f).when(mPowerManager) - .getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM); - doReturn(1.0f).when(mPowerManager) - .getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM); + doReturn(0.0f).when(mPowerManager).getBrightnessConstraint( + DEFAULT_DISPLAY, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM); + doReturn(1.0f).when(mPowerManager).getBrightnessConstraint( + DEFAULT_DISPLAY, PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM); doReturn(currentBrightness).when(mDisplayManager) - .getBrightness(0); + .getBrightness(DEFAULT_DISPLAY); } void verifyNewBrightness(float newBrightness) { diff --git a/services/tests/wmtests/src/com/android/server/wm/CameraCompatFreeformPolicyTests.java b/services/tests/wmtests/src/com/android/server/wm/CameraCompatFreeformPolicyTests.java index c427583d3001..3750dd38aa8c 100644 --- a/services/tests/wmtests/src/com/android/server/wm/CameraCompatFreeformPolicyTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/CameraCompatFreeformPolicyTests.java @@ -31,6 +31,9 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; +import static android.view.Surface.ROTATION_0; +import static android.view.Surface.ROTATION_270; +import static android.view.Surface.ROTATION_90; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doAnswer; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; @@ -46,22 +49,26 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.app.CameraCompatTaskInfo; +import android.app.IApplicationThread; import android.app.WindowConfiguration.WindowingMode; import android.app.servertransaction.RefreshCallbackItem; import android.app.servertransaction.ResumeActivityItem; import android.compat.testing.PlatformCompatChangeRule; import android.content.ComponentName; import android.content.pm.ActivityInfo.ScreenOrientation; +import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.content.res.Configuration.Orientation; import android.graphics.Rect; import android.hardware.camera2.CameraManager; import android.os.Handler; +import android.platform.test.annotations.DisableFlags; import android.platform.test.annotations.EnableFlags; import android.platform.test.annotations.Presubmit; import android.view.DisplayInfo; @@ -76,6 +83,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import java.util.concurrent.Executor; @@ -137,12 +145,64 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { mCameraCompatFreeformPolicy = new CameraCompatFreeformPolicy(mDisplayContent, cameraStateMonitor, mActivityRefresher); - setDisplayRotation(Surface.ROTATION_90); + setDisplayRotation(ROTATION_90); mCameraCompatFreeformPolicy.start(); cameraStateMonitor.startListeningToCameraState(); } @Test + @DisableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING) + @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) + public void testIsCameraRunningAndWindowingModeEligible_featureDisabled_returnsFalse() { + configureActivity(SCREEN_ORIENTATION_PORTRAIT); + + mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); + + assertFalse(mCameraCompatFreeformPolicy.isCameraRunningAndWindowingModeEligible(mActivity)); + } + + @Test + @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING) + public void testIsCameraRunningAndWindowingModeEligible_overrideDisabled_returnsFalse() { + configureActivity(SCREEN_ORIENTATION_PORTRAIT); + + mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); + + assertFalse(mCameraCompatFreeformPolicy.isCameraRunningAndWindowingModeEligible(mActivity)); + } + + @Test + @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING) + @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) + public void testIsCameraRunningAndWindowingModeEligible_cameraNotRunning_returnsFalse() { + configureActivity(SCREEN_ORIENTATION_PORTRAIT); + + assertFalse(mCameraCompatFreeformPolicy.isCameraRunningAndWindowingModeEligible(mActivity)); + } + + @Test + @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING) + @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) + public void testIsCameraRunningAndWindowingModeEligible_notFreeformWindowing_returnsFalse() { + configureActivity(SCREEN_ORIENTATION_PORTRAIT, WINDOWING_MODE_FULLSCREEN); + + mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); + + assertFalse(mCameraCompatFreeformPolicy.isCameraRunningAndWindowingModeEligible(mActivity)); + } + + @Test + @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING) + @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) + public void testIsCameraRunningAndWindowingModeEligible_optInFreeformCameraRunning_true() { + configureActivity(SCREEN_ORIENTATION_PORTRAIT); + + mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); + + assertTrue(mCameraCompatFreeformPolicy.isCameraRunningAndWindowingModeEligible(mActivity)); + } + + @Test @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING) @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) public void testFullscreen_doesNotActivateCameraCompatMode() { @@ -176,7 +236,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) public void testCameraConnected_deviceInPortrait_portraitCameraCompatMode() throws Exception { configureActivity(SCREEN_ORIENTATION_PORTRAIT); - setDisplayRotation(Surface.ROTATION_0); + setDisplayRotation(ROTATION_0); mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); assertInCameraCompatMode(CAMERA_COMPAT_FREEFORM_PORTRAIT_DEVICE_IN_PORTRAIT); @@ -188,7 +248,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) public void testCameraConnected_deviceInLandscape_portraitCameraCompatMode() throws Exception { configureActivity(SCREEN_ORIENTATION_PORTRAIT); - setDisplayRotation(Surface.ROTATION_270); + setDisplayRotation(ROTATION_270); mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); assertInCameraCompatMode(CAMERA_COMPAT_FREEFORM_PORTRAIT_DEVICE_IN_LANDSCAPE); @@ -200,7 +260,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) public void testCameraConnected_deviceInPortrait_landscapeCameraCompatMode() throws Exception { configureActivity(SCREEN_ORIENTATION_LANDSCAPE); - setDisplayRotation(Surface.ROTATION_0); + setDisplayRotation(ROTATION_0); mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); assertInCameraCompatMode(CAMERA_COMPAT_FREEFORM_LANDSCAPE_DEVICE_IN_PORTRAIT); @@ -212,7 +272,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) public void testCameraConnected_deviceInLandscape_landscapeCameraCompatMode() throws Exception { configureActivity(SCREEN_ORIENTATION_LANDSCAPE); - setDisplayRotation(Surface.ROTATION_270); + setDisplayRotation(ROTATION_270); mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); assertInCameraCompatMode(CAMERA_COMPAT_FREEFORM_LANDSCAPE_DEVICE_IN_LANDSCAPE); @@ -224,7 +284,7 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) public void testCameraReconnected_cameraCompatModeAndRefresh() throws Exception { configureActivity(SCREEN_ORIENTATION_PORTRAIT); - setDisplayRotation(Surface.ROTATION_270); + setDisplayRotation(ROTATION_270); mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); callOnActivityConfigurationChanging(mActivity, /* letterboxNew= */ true, @@ -414,6 +474,36 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { /* delta= */ 0.001); } + @Test + @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING) + @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) + public void testOnCameraOpened_portraitActivity_sandboxesDisplayRotationAndUpdatesApp() throws + Exception { + configureActivity(SCREEN_ORIENTATION_PORTRAIT); + setDisplayRotation(ROTATION_270); + + mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); + + // This is a portrait rotation for a device with portrait natural orientation (most common, + // currently the only one supported). + assertCompatibilityInfoSentWithDisplayRotation(ROTATION_0); + } + + @Test + @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING) + @EnableCompatChanges({OVERRIDE_CAMERA_COMPAT_ENABLE_FREEFORM_WINDOWING_TREATMENT}) + public void testOnCameraOpened_landscapeActivity_sandboxesDisplayRotationAndUpdatesApp() throws + Exception { + configureActivity(SCREEN_ORIENTATION_LANDSCAPE); + setDisplayRotation(ROTATION_0); + + mCameraAvailabilityCallback.onCameraOpened(CAMERA_ID_1, TEST_PACKAGE_1); + + // This is a landscape rotation for a device with portrait natural orientation (most common, + // currently the only one supported). + assertCompatibilityInfoSentWithDisplayRotation(ROTATION_90); + } + private void configureActivity(@ScreenOrientation int activityOrientation) { configureActivity(activityOrientation, WINDOWING_MODE_FREEFORM); } @@ -444,7 +534,9 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { doReturn(mActivity).when(mDisplayContent).topRunningActivity(anyBoolean()); doReturn(naturalOrientation).when(mDisplayContent).getNaturalOrientation(); - doReturn(true).when(mActivity).inFreeformWindowingMode(); + doReturn(windowingMode == WINDOWING_MODE_FREEFORM).when(mActivity) + .inFreeformWindowingMode(); + setupMockApplicationThread(); } private void assertInCameraCompatMode(@CameraCompatTaskInfo.FreeformCameraCompatMode int mode) { @@ -503,9 +595,27 @@ public class CameraCompatFreeformPolicyTests extends WindowTestsBase { // case for most standard phones and tablets. // TODO(b/365725400): handle landscape natural orientation. displayInfo.logicalHeight = displayRotation % 180 == 0 ? 800 : 600; - displayInfo.logicalWidth = displayRotation % 180 == 0 ? 600 : 800; + displayInfo.logicalWidth = displayRotation % 180 == 0 ? 600 : 800; return displayInfo; }).when(mDisplayContent.mWmService.mDisplayManagerInternal) .getDisplayInfo(anyInt()); } + + private void setupMockApplicationThread() { + IApplicationThread mockApplicationThread = mock(IApplicationThread.class); + spyOn(mActivity.app); + doReturn(mockApplicationThread).when(mActivity.app).getThread(); + } + + private void assertCompatibilityInfoSentWithDisplayRotation(@Surface.Rotation int + expectedRotation) throws Exception { + final ArgumentCaptor<CompatibilityInfo> compatibilityInfoArgumentCaptor = + ArgumentCaptor.forClass(CompatibilityInfo.class); + verify(mActivity.app.getThread()).updatePackageCompatibilityInfo(eq(mActivity.packageName), + compatibilityInfoArgumentCaptor.capture()); + + final CompatibilityInfo compatInfo = compatibilityInfoArgumentCaptor.getValue(); + assertTrue(compatInfo.isOverrideDisplayRotationRequired()); + assertEquals(expectedRotation, compatInfo.applicationDisplayRotation); + } } diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java index a425401c6238..bfa6cb820a42 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowManagerServiceTests.java @@ -29,6 +29,7 @@ import static android.view.Display.FLAG_OWN_FOCUS; import static android.view.Display.INVALID_DISPLAY; import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; import static android.view.WindowManager.LayoutParams.FLAG_SECURE; +import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SENSITIVE_FOR_PRIVACY; import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_SPY; import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE; @@ -46,6 +47,7 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.doNothing; import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn; import static com.android.dx.mockito.inline.extended.ExtendedMockito.never; import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn; +import static com.android.hardware.input.Flags.FLAG_OVERRIDE_POWER_KEY_BEHAVIOR_IN_FOCUSED_WINDOW; import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND; import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND_FLOATING; import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_SOLID_COLOR; @@ -75,6 +77,7 @@ import static org.mockito.Mockito.when; import android.app.ActivityThread; import android.app.IApplicationThread; import android.content.pm.ActivityInfo; +import android.content.pm.PackageManager; import android.graphics.Rect; import android.os.Binder; import android.os.IBinder; @@ -1136,6 +1139,53 @@ public class WindowManagerServiceTests extends WindowTestsBase { } @Test + @RequiresFlagsEnabled(FLAG_OVERRIDE_POWER_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) + public void testUpdateInputChannel_sanitizeWithoutPermission_ThrowsError() { + final Session session = mock(Session.class); + final int callingUid = Process.FIRST_APPLICATION_UID; + final int callingPid = 1234; + final SurfaceControl surfaceControl = mock(SurfaceControl.class); + final IBinder window = new Binder(); + final InputTransferToken inputTransferToken = mock(InputTransferToken.class); + + + final InputChannel inputChannel = new InputChannel(); + + assertThrows(IllegalArgumentException.class, () -> + mWm.grantInputChannel(session, callingUid, callingPid, DEFAULT_DISPLAY, + surfaceControl, window, null /* hostInputToken */, FLAG_NOT_FOCUSABLE, + 0 /* privateFlags */, + INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS, + TYPE_APPLICATION, null /* windowToken */, inputTransferToken, + "TestInputChannel", inputChannel)); + } + + + @Test + @RequiresFlagsEnabled(FLAG_OVERRIDE_POWER_KEY_BEHAVIOR_IN_FOCUSED_WINDOW) + public void testUpdateInputChannel_sanitizeWithPermission_doesNotThrowError() { + final Session session = mock(Session.class); + final int callingUid = Process.FIRST_APPLICATION_UID; + final int callingPid = 1234; + final SurfaceControl surfaceControl = mock(SurfaceControl.class); + final IBinder window = new Binder(); + final InputTransferToken inputTransferToken = mock(InputTransferToken.class); + + doReturn(PackageManager.PERMISSION_GRANTED).when(mWm.mContext).checkPermission( + android.Manifest.permission.OVERRIDE_SYSTEM_KEY_BEHAVIOR_IN_FOCUSED_WINDOW, + callingPid, + callingUid); + + final InputChannel inputChannel = new InputChannel(); + + mWm.grantInputChannel(session, callingUid, callingPid, DEFAULT_DISPLAY, surfaceControl, + window, null /* hostInputToken */, FLAG_NOT_FOCUSABLE, 0 /* privateFlags */, + INPUT_FEATURE_RECEIVE_POWER_KEY_DOUBLE_PRESS, + TYPE_APPLICATION, null /* windowToken */, inputTransferToken, "TestInputChannel", + inputChannel); + } + + @Test public void testUpdateInputChannel_allowSpyWindowForInputMonitorPermission() { final Session session = mock(Session.class); final int callingUid = Process.SYSTEM_UID; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 7cfdec664a92..59cb5ff37874 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -10061,6 +10061,13 @@ public class CarrierConfigManager { "satellite_nidd_apn_name_string"; /** + * The display name that will be used for satellite functionality within the UI. + * The default string value for this is "Satellite". + * @hide + */ + public static final String KEY_SATELLITE_DISPLAY_NAME_STRING = "satellite_display_name_string"; + + /** * Default value {@code true}, meaning when an emergency call request comes in, if the device is * in emergency satellite mode but hasn't sent the first satellite datagram, then exits * satellite mode to allow the emergency call to go through. @@ -11343,6 +11350,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_EMERGENCY_MESSAGING_SUPPORTED_BOOL, false); sDefaults.putInt(KEY_EMERGENCY_CALL_TO_SATELLITE_T911_HANDOVER_TIMEOUT_MILLIS_INT, (int) TimeUnit.SECONDS.toMillis(30)); + sDefaults.putString(KEY_SATELLITE_DISPLAY_NAME_STRING, ""); sDefaults.putBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL, false); sDefaults.putBoolean(KEY_SATELLITE_ROAMING_P2P_SMS_SUPPORTED_BOOL, false); sDefaults.putString(KEY_SATELLITE_NIDD_APN_NAME_STRING, ""); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 024d7f580a53..65a52daae99f 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -19636,7 +19636,7 @@ public class TelephonyManager { * Android assigns each carrier with a canonical integer a.k.a. carrier id. * The carrier ID is an Android platform-wide identifier for a carrier. * AOSP maintains carrier ID assignments in - * <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/master/assets/latest_carrier_id/carrier_list.textpb">here</a> + * <a href="https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/main/assets/latest_carrier_id/carrier_list.textpb">here</a> * * @param carrierIdentifier {@link CarrierIdentifier} * diff --git a/telephony/java/android/telephony/satellite/SatelliteManager.java b/telephony/java/android/telephony/satellite/SatelliteManager.java index db5689b7a208..1025c1506d4a 100644 --- a/telephony/java/android/telephony/satellite/SatelliteManager.java +++ b/telephony/java/android/telephony/satellite/SatelliteManager.java @@ -292,6 +292,13 @@ public final class SatelliteManager { /** * Bundle key to get the response from + * {@link #requestSatelliteDisplayName(Executor, OutcomeReceiver)}. + * @hide + */ + public static final String KEY_SATELLITE_DISPLAY_NAME = "satellite_display_name"; + + /** + * Bundle key to get the response from * {@link #requestSelectedNbIotSatelliteSubscriptionId(Executor, OutcomeReceiver)}. * @hide */ @@ -3594,6 +3601,65 @@ public final class SatelliteManager { } /** + * Request to get the display name of satellite feature in the UI. + * + * @param executor The executor on which the callback will be called. + * @param callback The callback object to which the result will be delivered. + * If the request is successful, {@link OutcomeReceiver#onResult(Object)} + * will return display name of the satellite feature in string format. Defaults + * to satellite. If the request is not successful, + * {@link OutcomeReceiver#onError(Throwable)} will return an error with + * a SatelliteException. + * + * @throws SecurityException if the caller doesn't have required permission. + * @throws IllegalStateException if the Telephony process is not currently available. + * @hide + */ + @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION) + public void requestSatelliteDisplayName( + @NonNull @CallbackExecutor Executor executor, + @NonNull OutcomeReceiver<String, SatelliteException> callback) { + Objects.requireNonNull(executor); + Objects.requireNonNull(callback); + + try { + ITelephony telephony = getITelephony(); + if (telephony != null) { + ResultReceiver receiver = new ResultReceiver(null) { + @Override + protected void onReceiveResult(int resultCode, Bundle resultData) { + if (resultCode == SATELLITE_RESULT_SUCCESS) { + if (resultData.containsKey(KEY_SATELLITE_DISPLAY_NAME)) { + String satelliteDisplayName = + resultData.getString(KEY_SATELLITE_DISPLAY_NAME); + executor.execute(() -> Binder.withCleanCallingIdentity(() -> + callback.onResult(satelliteDisplayName))); + } else { + loge("KEY_SATELLITE_DISPLAY_NAME does not exist."); + executor.execute(() -> Binder.withCleanCallingIdentity(() -> + callback.onError(new SatelliteException( + SATELLITE_RESULT_REQUEST_FAILED)))); + } + } else { + executor.execute(() -> Binder.withCleanCallingIdentity(() -> + callback.onError(new SatelliteException(resultCode)))); + } + } + }; + telephony.requestSatelliteDisplayName(receiver); + } else { + loge("requestSatelliteDisplayName() invalid telephony"); + executor.execute(() -> Binder.withCleanCallingIdentity(() -> callback.onError( + new SatelliteException(SATELLITE_RESULT_ILLEGAL_STATE)))); + } + } catch (RemoteException ex) { + loge("requestSatelliteDisplayName() RemoteException: " + ex); + executor.execute(() -> Binder.withCleanCallingIdentity(() -> callback.onError( + new SatelliteException(SATELLITE_RESULT_ILLEGAL_STATE)))); + } + } + + /** * Deliver the list of provisioned satellite subscriber infos. * * @param list The list of provisioned satellite subscriber infos. diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 131f46bc790e..da7669fd81ad 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -3471,6 +3471,17 @@ interface ITelephony { void requestSatelliteSubscriberProvisionStatus(in ResultReceiver result); /** + * Request to get the name to display for Satellite subscription. + * + * @param receiver The result receiver that returns the diplay name to be used for the satellite + * subscription. + * @hide + */ + @JavaPassthrough(annotation="@android.annotation.RequiresPermission(" + + "android.Manifest.permission.SATELLITE_COMMUNICATION)") + void requestSatelliteDisplayName(in ResultReceiver receiver); + + /** * Deliver the list of provisioned satellite subscriber infos. * * @param list The list of provisioned satellite subscriber infos. diff --git a/tests/Input/src/com/android/server/input/InputDataStoreTests.kt b/tests/Input/src/com/android/server/input/InputDataStoreTests.kt new file mode 100644 index 000000000000..78c828bafd8f --- /dev/null +++ b/tests/Input/src/com/android/server/input/InputDataStoreTests.kt @@ -0,0 +1,504 @@ +/* + * Copyright 2024 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.input + +import android.app.role.RoleManager +import android.content.Context +import android.content.ContextWrapper +import android.content.Intent +import android.hardware.input.AppLaunchData +import android.hardware.input.InputGestureData +import android.hardware.input.KeyGestureEvent +import android.platform.test.annotations.Presubmit +import android.util.AtomicFile +import android.view.KeyEvent +import androidx.test.core.app.ApplicationProvider +import java.io.ByteArrayInputStream +import java.io.ByteArrayOutputStream +import java.io.File +import java.io.FileOutputStream +import java.io.InputStream +import java.nio.charset.StandardCharsets +import kotlin.test.assertEquals +import org.junit.Before +import org.junit.Test +import org.mockito.Mockito + +/** + * Tests for {@link InputDataStore}. + * + * Build/Install/Run: + * atest InputTests:InputDataStoreTests + */ +@Presubmit +class InputDataStoreTests { + + companion object { + const val USER_ID = 1 + } + + private lateinit var context: Context + private lateinit var inputDataStore: InputDataStore + private lateinit var tempFile: File + + @Before + fun setup() { + context = Mockito.spy(ContextWrapper(ApplicationProvider.getApplicationContext())) + setupInputDataStore() + } + + private fun setupInputDataStore() { + tempFile = File.createTempFile("input_gestures", ".xml") + inputDataStore = InputDataStore(object : InputDataStore.FileInjector("input_gestures") { + private val atomicFile: AtomicFile = AtomicFile(tempFile) + + override fun openRead(userId: Int): InputStream? { + return atomicFile.openRead() + } + + override fun startWrite(userId: Int): FileOutputStream? { + return atomicFile.startWrite() + } + + override fun finishWrite(userId: Int, fos: FileOutputStream?, success: Boolean) { + if (success) { + atomicFile.finishWrite(fos) + } else { + atomicFile.failWrite(fos) + } + } + }) + } + + private fun getPrintableXml(inputGestures: List<InputGestureData>): String { + val outputStream = ByteArrayOutputStream() + inputDataStore.writeInputGestureXml(outputStream, true, inputGestures) + return outputStream.toString(StandardCharsets.UTF_8).trimIndent() + } + + @Test + fun saveToDiskKeyGesturesOnly() { + val inputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_H, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_HOME) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_1, + KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_BACK) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_2, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS) + .build() + ) + + inputDataStore.saveInputGestures(USER_ID, inputGestures) + assertEquals( + inputGestures, + inputDataStore.loadInputGestures(USER_ID), + getPrintableXml(inputGestures) + ) + } + + @Test + fun saveToDiskTouchpadGestures() { + val inputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createTouchpadTrigger( + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_HOME) + .build() + ) + + inputDataStore.saveInputGestures(USER_ID, inputGestures) + assertEquals( + inputGestures, + inputDataStore.loadInputGestures(USER_ID), + getPrintableXml(inputGestures) + ) + } + + @Test + fun saveToDiskAppLaunchGestures() { + val inputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createTouchpadTrigger( + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_APPLICATION) + .setAppLaunchData(AppLaunchData.createLaunchDataForRole(RoleManager.ROLE_BROWSER)) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_2, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_APPLICATION) + .setAppLaunchData(AppLaunchData.createLaunchDataForCategory(Intent.CATEGORY_APP_CONTACTS)) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_1, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_APPLICATION) + .setAppLaunchData( + AppLaunchData.createLaunchDataForComponent( + "com.test", + "com.test.BookmarkTest" + ) + ) + .build() + ) + + inputDataStore.saveInputGestures(USER_ID, inputGestures) + assertEquals( + inputGestures, + inputDataStore.loadInputGestures(USER_ID), + getPrintableXml(inputGestures) + ) + } + + @Test + fun saveToDiskCombinedGestures() { + val inputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_1, + KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_BACK) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_2, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createTouchpadTrigger( + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_HOME) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_9, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_LAUNCH_APPLICATION) + .setAppLaunchData(AppLaunchData.createLaunchDataForCategory(Intent.CATEGORY_APP_CONTACTS)) + .build(), + ) + + inputDataStore.saveInputGestures(USER_ID, inputGestures) + assertEquals( + inputGestures, + inputDataStore.loadInputGestures(USER_ID), + getPrintableXml(inputGestures) + ) + } + + @Test + fun validXmlParse() { + val xmlData = """ + <?xml version='1.0' encoding='utf-8' standalone='yes' ?> + <root> + <input_gesture_list> + <input_gesture key_gesture_type="3"> + <key_trigger keycode="8" modifiers="69632" /> + </input_gesture> + <input_gesture key_gesture_type="21"> + <key_trigger keycode="9" modifiers="65536" /> + </input_gesture> + <input_gesture key_gesture_type="1"> + <touchpad_trigger touchpad_gesture_type="1" /> + </input_gesture> + </input_gesture_list> + </root>""".trimIndent() + val validInputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_1, + KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_BACK) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_2, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createTouchpadTrigger( + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_HOME) + .build() + ) + val inputStream = ByteArrayInputStream(xmlData.toByteArray(Charsets.UTF_8)) + assertEquals( + validInputGestures, + inputDataStore.readInputGesturesXml(inputStream, true) + ) + } + + @Test + fun missingTriggerData() { + val xmlData = """ + <?xml version='1.0' encoding='utf-8' standalone='yes' ?> + <root> + <input_gesture_list> + <input_gesture key_gesture_type="3"> + </input_gesture> + <input_gesture key_gesture_type="21"> + <key_trigger keycode="9" modifiers="65536" /> + </input_gesture> + <input_gesture key_gesture_type="1"> + <touchpad_trigger touchpad_gesture_type="1" /> + </input_gesture> + </input_gesture_list> + </root>""".trimIndent() + val validInputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_2, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createTouchpadTrigger( + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_HOME) + .build() + ) + val inputStream = ByteArrayInputStream(xmlData.toByteArray(Charsets.UTF_8)) + assertEquals( + validInputGestures, + inputDataStore.readInputGesturesXml(inputStream, true) + ) + } + + @Test + fun invalidKeycode() { + val xmlData = """ + <?xml version='1.0' encoding='utf-8' standalone='yes' ?> + <root> + <input_gesture_list> + <input_gesture key_gesture_type="3"> + <key_trigger keycode="8" modifiers="69632" /> + </input_gesture> + <input_gesture key_gesture_type="21"> + <key_trigger keycode="9999999" modifiers="65536" /> + </input_gesture> + <input_gesture key_gesture_type="1"> + <touchpad_trigger touchpad_gesture_type="1" /> + </input_gesture> + </input_gesture_list> + </root>""".trimIndent() + val validInputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_1, + KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_BACK) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createTouchpadTrigger( + InputGestureData.TOUCHPAD_GESTURE_TYPE_THREE_FINGER_TAP + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_HOME) + .build() + ) + val inputStream = ByteArrayInputStream(xmlData.toByteArray(Charsets.UTF_8)) + assertEquals( + validInputGestures, + inputDataStore.readInputGesturesXml(inputStream, true) + ) + } + + @Test + fun invalidTriggerName() { + val xmlData = """ + <?xml version='1.0' encoding='utf-8' standalone='yes' ?> + <root> + <input_gesture_list> + <input_gesture key_gesture_type="3"> + <key_trigger keycode="8" modifiers="69632" /> + </input_gesture> + <input_gesture key_gesture_type="21"> + <key_trigger keycode="9" modifiers="65536" /> + </input_gesture> + <input_gesture key_gesture_type="1"> + <invalid_trigger_name touchpad_gesture_type="1" /> + </input_gesture> + </input_gesture_list> + </root>""".trimIndent() + val validInputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_1, + KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_BACK) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_2, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS) + .build(), + ) + val inputStream = ByteArrayInputStream(xmlData.toByteArray(Charsets.UTF_8)) + assertEquals( + validInputGestures, + inputDataStore.readInputGesturesXml(inputStream, true) + ) + } + + @Test + fun invalidTouchpadGestureType() { + val xmlData = """ + <?xml version='1.0' encoding='utf-8' standalone='yes' ?> + <root> + <input_gesture_list> + <input_gesture key_gesture_type="3"> + <key_trigger keycode="8" modifiers="69632" /> + </input_gesture> + <input_gesture key_gesture_type="21"> + <key_trigger keycode="9" modifiers="65536" /> + </input_gesture> + <input_gesture key_gesture_type="1"> + <touchpad_trigger touchpad_gesture_type="9999" /> + </input_gesture> + </input_gesture_list> + </root>""".trimIndent() + val validInputGestures = listOf( + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_1, + KeyEvent.META_META_ON or KeyEvent.META_CTRL_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_BACK) + .build(), + InputGestureData.Builder() + .setTrigger( + InputGestureData.createKeyTrigger( + KeyEvent.KEYCODE_2, + KeyEvent.META_META_ON + ) + ) + .setKeyGestureType(KeyGestureEvent.KEY_GESTURE_TYPE_ALL_APPS) + .build(), + ) + val inputStream = ByteArrayInputStream(xmlData.toByteArray(Charsets.UTF_8)) + assertEquals( + validInputGestures, + inputDataStore.readInputGesturesXml(inputStream, true) + ) + } + + @Test + fun emptyInputGestureList() { + val xmlData = """ + <?xml version='1.0' encoding='utf-8' standalone='yes' ?> + <root> + <input_gesture_list> + </input_gesture_list> + </root>""".trimIndent() + val inputStream = ByteArrayInputStream(xmlData.toByteArray(Charsets.UTF_8)) + assertEquals( + listOf(), + inputDataStore.readInputGesturesXml(inputStream, true) + ) + } + + @Test + fun invalidTag() { + val xmlData = """ + <?xml version='1.0' encoding='utf-8' standalone='yes' ?> + <root> + <invalid_tag_name> + </invalid_tag_name> + </root>""".trimIndent() + val inputStream = ByteArrayInputStream(xmlData.toByteArray(Charsets.UTF_8)) + assertEquals( + listOf(), + inputDataStore.readInputGesturesXml(inputStream, true) + ) + } +}
\ No newline at end of file diff --git a/tests/Input/src/com/android/server/input/InputManagerServiceTests.kt b/tests/Input/src/com/android/server/input/InputManagerServiceTests.kt index 8bc741c86543..43844f6514e8 100644 --- a/tests/Input/src/com/android/server/input/InputManagerServiceTests.kt +++ b/tests/Input/src/com/android/server/input/InputManagerServiceTests.kt @@ -156,8 +156,7 @@ class InputManagerServiceTests { } override fun getKeyboardBacklightController( - nativeService: NativeInputManagerService?, - dataStore: PersistentDataStore? + nativeService: NativeInputManagerService? ): InputManagerService.KeyboardBacklightControllerInterface { return kbdController } diff --git a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt index 36a89f95aa6f..c6d281914f2c 100644 --- a/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt +++ b/tests/Input/src/com/android/server/input/KeyGestureControllerTests.kt @@ -40,6 +40,7 @@ import android.os.test.TestLooper import android.platform.test.annotations.EnableFlags import android.platform.test.annotations.Presubmit import android.platform.test.flag.junit.SetFlagsRule +import android.util.AtomicFile import android.view.InputDevice import android.view.KeyCharacterMap import android.view.KeyEvent @@ -50,6 +51,9 @@ import com.android.internal.R import com.android.internal.annotations.Keep import com.android.internal.util.FrameworkStatsLog import com.android.modules.utils.testing.ExtendedMockitoRule +import java.io.File +import java.io.FileOutputStream +import java.io.InputStream import junitparams.JUnitParamsRunner import junitparams.Parameters import org.junit.After @@ -123,6 +127,8 @@ class KeyGestureControllerTests { private lateinit var keyGestureController: KeyGestureController private lateinit var inputManagerGlobalSession: InputManagerGlobal.TestSession private lateinit var testLooper: TestLooper + private lateinit var tempFile: File + private lateinit var inputDataStore: InputDataStore private var events = mutableListOf<KeyGestureEvent>() @Before @@ -133,6 +139,31 @@ class KeyGestureControllerTests { setupBehaviors() testLooper = TestLooper() currentPid = Process.myPid() + tempFile = File.createTempFile("input_gestures", ".xml") + inputDataStore = + InputDataStore(object : InputDataStore.FileInjector("input_gestures.xml") { + private val atomicFile: AtomicFile = AtomicFile(tempFile) + + override fun openRead(userId: Int): InputStream? { + return atomicFile.openRead() + } + + override fun startWrite(userId: Int): FileOutputStream? { + return atomicFile.startWrite() + } + + override fun finishWrite(userId: Int, fos: FileOutputStream?, success: Boolean) { + if (success) { + atomicFile.finishWrite(fos) + } else { + atomicFile.failWrite(fos) + } + } + + override fun getAtomicFileForUserId(userId: Int): AtomicFile { + return atomicFile + } + }) } @After @@ -174,10 +205,12 @@ class KeyGestureControllerTests { } private fun setupKeyGestureController() { - keyGestureController = KeyGestureController(context, testLooper.looper) + keyGestureController = + KeyGestureController(context, testLooper.looper, inputDataStore) Mockito.`when`(iInputManager.getAppLaunchBookmarks()) .thenReturn(keyGestureController.appLaunchBookmarks) keyGestureController.systemRunning() + testLooper.dispatchAll() } private fun notifyHomeGestureCompleted() { @@ -1424,6 +1457,45 @@ class KeyGestureControllerTests { testKeyGestureInternal(test) } + @Test + @Parameters(method = "customInputGesturesTestArguments") + fun testCustomKeyGesturesSavedAndLoadedByController(test: TestData) { + val userId = 10 + setupKeyGestureController() + val builder = InputGestureData.Builder() + .setKeyGestureType(test.expectedKeyGestureType) + .setTrigger( + InputGestureData.createKeyTrigger( + test.expectedKeys[0], + test.expectedModifierState + ) + ) + if (test.expectedAppLaunchData != null) { + builder.setAppLaunchData(test.expectedAppLaunchData) + } + val inputGestureData = builder.build() + + keyGestureController.setCurrentUserId(userId) + testLooper.dispatchAll() + keyGestureController.addCustomInputGesture(userId, inputGestureData.aidlData) + testLooper.dispatchAll() + + // Reinitialize the gesture controller simulating a login/logout for the user. + setupKeyGestureController() + keyGestureController.setCurrentUserId(userId) + testLooper.dispatchAll() + val savedInputGestures = keyGestureController.getCustomInputGestures(userId, null) + assertEquals( + "Test: $test doesn't produce correct number of saved input gestures", + 1, + savedInputGestures.size + ) + assertEquals( + "Test: $test doesn't produce correct input gesture data", inputGestureData, + InputGestureData(savedInputGestures[0]) + ) + } + class TouchpadTestData( val name: String, val touchpadGestureType: Int, @@ -1502,6 +1574,39 @@ class KeyGestureControllerTests { keyGestureController.unregisterKeyGestureHandler(handler, 0) } + @Test + @Parameters(method = "customTouchpadGesturesTestArguments") + fun testCustomTouchpadGesturesSavedAndLoadedByController(test: TouchpadTestData) { + val userId = 10 + setupKeyGestureController() + val builder = InputGestureData.Builder() + .setKeyGestureType(test.expectedKeyGestureType) + .setTrigger(InputGestureData.createTouchpadTrigger(test.touchpadGestureType)) + if (test.expectedAppLaunchData != null) { + builder.setAppLaunchData(test.expectedAppLaunchData) + } + val inputGestureData = builder.build() + keyGestureController.setCurrentUserId(userId) + testLooper.dispatchAll() + keyGestureController.addCustomInputGesture(userId, inputGestureData.aidlData) + testLooper.dispatchAll() + + // Reinitialize the gesture controller simulating a login/logout for the user. + setupKeyGestureController() + keyGestureController.setCurrentUserId(userId) + testLooper.dispatchAll() + val savedInputGestures = keyGestureController.getCustomInputGestures(userId, null) + assertEquals( + "Test: $test doesn't produce correct number of saved input gestures", + 1, + savedInputGestures.size + ) + assertEquals( + "Test: $test doesn't produce correct input gesture data", inputGestureData, + InputGestureData(savedInputGestures[0]) + ) + } + private fun testKeyGestureInternal(test: TestData) { val handledEvents = mutableListOf<KeyGestureEvent>() val handler = KeyGestureHandler { event, _ -> diff --git a/tests/Input/src/com/android/server/input/KeyboardBacklightControllerTests.kt b/tests/Input/src/com/android/server/input/KeyboardBacklightControllerTests.kt index 938e2f8a3611..644d5a0679de 100644 --- a/tests/Input/src/com/android/server/input/KeyboardBacklightControllerTests.kt +++ b/tests/Input/src/com/android/server/input/KeyboardBacklightControllerTests.kt @@ -25,6 +25,7 @@ import android.hardware.input.IKeyboardBacklightListener import android.hardware.input.IKeyboardBacklightState import android.hardware.input.InputManager import android.hardware.lights.Light +import android.os.SystemProperties import android.os.UEventObserver import android.os.test.TestLooper import android.platform.test.annotations.Presubmit @@ -32,16 +33,13 @@ import android.view.InputDevice import android.util.TypedValue import androidx.test.annotation.UiThreadTest import androidx.test.core.app.ApplicationProvider +import com.android.dx.mockito.inline.extended.ExtendedMockito import com.android.internal.R +import com.android.modules.utils.testing.ExtendedMockitoRule import com.android.server.input.KeyboardBacklightController.DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL import com.android.server.input.KeyboardBacklightController.MAX_BRIGHTNESS_CHANGE_STEPS import com.android.test.input.MockInputManagerRule -import java.io.FileNotFoundException -import java.io.FileOutputStream -import java.io.IOException -import java.io.InputStream import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse import org.junit.Assert.assertNotEquals import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull @@ -56,7 +54,6 @@ import org.mockito.Mockito.anyInt import org.mockito.Mockito.eq import org.mockito.Mockito.spy import org.mockito.Mockito.`when` -import org.mockito.junit.MockitoJUnit private fun createKeyboard(deviceId: Int): InputDevice = InputDevice.Builder() @@ -101,7 +98,8 @@ class KeyboardBacklightControllerTests { } @get:Rule - val rule = MockitoJUnit.rule()!! + val extendedMockitoRule = + ExtendedMockitoRule.Builder(this).mockStatic(SystemProperties::class.java).build()!! @get:Rule val inputManagerRule = MockInputManagerRule() @@ -113,7 +111,6 @@ class KeyboardBacklightControllerTests { private lateinit var resources: Resources private lateinit var keyboardBacklightController: KeyboardBacklightController private lateinit var context: Context - private lateinit var dataStore: PersistentDataStore private lateinit var testLooper: TestLooper private var lightColorMap: HashMap<Int, Int> = HashMap() private var lastBacklightState: KeyboardBacklightState? = null @@ -124,21 +121,8 @@ class KeyboardBacklightControllerTests { fun setup() { context = spy(ContextWrapper(ApplicationProvider.getApplicationContext())) `when`(context.resources).thenReturn(resources) - dataStore = PersistentDataStore(object : PersistentDataStore.Injector() { - override fun openRead(): InputStream? { - throw FileNotFoundException() - } - - override fun startWrite(): FileOutputStream? { - throw IOException() - } - - override fun finishWrite(fos: FileOutputStream?, success: Boolean) {} - }) testLooper = TestLooper() setupConfig() - keyboardBacklightController = KeyboardBacklightController(context, native, dataStore, - testLooper.looper, FakeAnimatorFactory(), uEventManager) val inputManager = InputManager(context) `when`(context.getSystemService(eq(Context.INPUT_SERVICE))).thenReturn(inputManager) `when`(inputManagerRule.mock.inputDeviceIds).thenReturn(intArrayOf(DEVICE_ID)) @@ -155,6 +139,7 @@ class KeyboardBacklightControllerTests { sysfsNodeChanges++ } } + private fun setupConfig() { val brightnessValues = intArrayOf(100, 200, 0) val decreaseThresholds = intArrayOf(-1, 900, 1900) @@ -180,271 +165,166 @@ class KeyboardBacklightControllerTests { Unit } } - @Test - fun testKeyboardBacklightIncrementDecrement() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, - DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL) - } - } - @Test - fun testKeyboardWithoutBacklight() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithoutBacklight = createKeyboard(DEVICE_ID) - val keyboardInputLight = createLight(LIGHT_ID, Light.LIGHT_TYPE_INPUT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithoutBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardInputLight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - incrementKeyboardBacklight(DEVICE_ID) - assertTrue("Non Keyboard backlights should not change", lightColorMap.isEmpty()) - } + private fun setupController() { + keyboardBacklightController = KeyboardBacklightController(context, native, + testLooper.looper, FakeAnimatorFactory(), uEventManager) } @Test - fun testKeyboardWithMultipleLight() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - val keyboardInputLight = createLight(SECOND_LIGHT_ID, Light.LIGHT_TYPE_INPUT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn( - listOf( - keyboardBacklight, - keyboardInputLight - ) - ) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - incrementKeyboardBacklight(DEVICE_ID) - assertEquals("Only keyboard backlights should change", 1, lightColorMap.size) - assertNotNull("Keyboard backlight should change", lightColorMap[LIGHT_ID]) - assertNull("Input lights should not change", lightColorMap[SECOND_LIGHT_ID]) - } + fun testKeyboardBacklightIncrementDecrement() { + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL) } @Test - fun testRestoreBacklightOnInputDeviceAdded() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - - for (level in 1 until DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL.size) { - dataStore.setKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID, - DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[level] - 1 - ) - - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertEquals( - "Keyboard backlight level should be restored to the level saved in the " + - "data store", - Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[level], 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - keyboardBacklightController.onInputDeviceRemoved(DEVICE_ID) - } - } + fun testKeyboardWithoutBacklight() { + setupController() + val keyboardWithoutBacklight = createKeyboard(DEVICE_ID) + val keyboardInputLight = createLight(LIGHT_ID, Light.LIGHT_TYPE_INPUT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithoutBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardInputLight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + incrementKeyboardBacklight(DEVICE_ID) + assertTrue("Non Keyboard backlights should not change", lightColorMap.isEmpty()) } @Test - fun testRestoreBacklightOnInputDeviceChanged() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - dataStore.setKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID, - MAX_BRIGHTNESS - ) - - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertTrue( - "Keyboard backlight should not be changed until its added", - lightColorMap.isEmpty() + fun testKeyboardWithMultipleLight() { + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + val keyboardInputLight = createLight(SECOND_LIGHT_ID, Light.LIGHT_TYPE_INPUT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn( + listOf( + keyboardBacklight, + keyboardInputLight ) + ) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceChanged(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertEquals( - "Keyboard backlight level should be restored to the level saved in the data store", - Color.argb(MAX_BRIGHTNESS, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - } + incrementKeyboardBacklight(DEVICE_ID) + assertEquals("Only keyboard backlights should change", 1, lightColorMap.size) + assertNotNull("Keyboard backlight should change", lightColorMap[LIGHT_ID]) + assertNull("Input lights should not change", lightColorMap[SECOND_LIGHT_ID]) } @Test fun testKeyboardBacklight_registerUnregisterListener() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - val maxLevel = DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL.size - 1 - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - // Register backlight listener - val listener = KeyboardBacklightListener() - keyboardBacklightController.registerKeyboardBacklightListener(listener, 0) - - lastBacklightState = null - keyboardBacklightController.incrementKeyboardBacklight(DEVICE_ID) - testLooper.dispatchNext() + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + val maxLevel = DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL.size - 1 + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + // Register backlight listener + val listener = KeyboardBacklightListener() + keyboardBacklightController.registerKeyboardBacklightListener(listener, 0) + + lastBacklightState = null + keyboardBacklightController.incrementKeyboardBacklight(DEVICE_ID) + testLooper.dispatchNext() - assertEquals( - "Backlight state device Id should be $DEVICE_ID", - DEVICE_ID, - lastBacklightState!!.deviceId - ) - assertEquals( - "Backlight state brightnessLevel should be 1", - 1, - lastBacklightState!!.brightnessLevel - ) - assertEquals( - "Backlight state maxBrightnessLevel should be $maxLevel", - maxLevel, - lastBacklightState!!.maxBrightnessLevel - ) - assertEquals( - "Backlight state isTriggeredByKeyPress should be true", - true, - lastBacklightState!!.isTriggeredByKeyPress - ) + assertEquals( + "Backlight state device Id should be $DEVICE_ID", + DEVICE_ID, + lastBacklightState!!.deviceId + ) + assertEquals( + "Backlight state brightnessLevel should be 1", + 1, + lastBacklightState!!.brightnessLevel + ) + assertEquals( + "Backlight state maxBrightnessLevel should be $maxLevel", + maxLevel, + lastBacklightState!!.maxBrightnessLevel + ) + assertEquals( + "Backlight state isTriggeredByKeyPress should be true", + true, + lastBacklightState!!.isTriggeredByKeyPress + ) - // Unregister listener - keyboardBacklightController.unregisterKeyboardBacklightListener(listener, 0) + // Unregister listener + keyboardBacklightController.unregisterKeyboardBacklightListener(listener, 0) - lastBacklightState = null - incrementKeyboardBacklight(DEVICE_ID) + lastBacklightState = null + incrementKeyboardBacklight(DEVICE_ID) - assertNull("Listener should not receive any updates", lastBacklightState) - } + assertNull("Listener should not receive any updates", lastBacklightState) } @Test fun testKeyboardBacklight_userActivity() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - dataStore.setKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID, - MAX_BRIGHTNESS - ) - - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertEquals( - "Keyboard backlight level should be restored to the level saved in the data store", - Color.argb(MAX_BRIGHTNESS, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + incrementKeyboardBacklight(DEVICE_ID) + assertNotEquals( + "Keyboard backlight level should be incremented to a non-zero value", + 0, + lightColorMap[LIGHT_ID] + ) - testLooper.moveTimeForward((USER_INACTIVITY_THRESHOLD_MILLIS + 1000).toLong()) - testLooper.dispatchNext() - assertEquals( - "Keyboard backlight level should be turned off after inactivity", - 0, - lightColorMap[LIGHT_ID] - ) - } + testLooper.moveTimeForward((USER_INACTIVITY_THRESHOLD_MILLIS + 1000).toLong()) + testLooper.dispatchNext() + assertEquals( + "Keyboard backlight level should be turned off after inactivity", + 0, + lightColorMap[LIGHT_ID] + ) } @Test fun testKeyboardBacklight_displayOnOff() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - dataStore.setKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID, - MAX_BRIGHTNESS - ) + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + incrementKeyboardBacklight(DEVICE_ID) + + val currentValue = lightColorMap[LIGHT_ID] + assertNotEquals( + "Keyboard backlight level should be incremented to a non-zero value", + 0, + lightColorMap[LIGHT_ID] + ) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.handleInteractiveStateChange(true /* isDisplayOn */) - assertEquals( - "Keyboard backlight level should be restored to the level saved in the data " + - "store when display turned on", - Color.argb(MAX_BRIGHTNESS, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) + keyboardBacklightController.handleInteractiveStateChange(false /* isDisplayOn */) + assertEquals( + "Keyboard backlight level should be turned off after display is turned off", + 0, + lightColorMap[LIGHT_ID] + ) - keyboardBacklightController.handleInteractiveStateChange(false /* isDisplayOn */) - assertEquals( - "Keyboard backlight level should be turned off after display is turned off", - 0, - lightColorMap[LIGHT_ID] - ) - } + keyboardBacklightController.handleInteractiveStateChange(true /* isDisplayOn */) + assertEquals( + "Keyboard backlight level should be turned on after display is turned on", + currentValue, + lightColorMap[LIGHT_ID] + ) } @Test fun testKeyboardBacklightSysfsNodeAdded_AfterInputDeviceAdded() { + setupController() var counter = sysfsNodeChanges keyboardBacklightController.onKeyboardBacklightUEvent(UEventObserver.UEvent( "ACTION=add\u0000SUBSYSTEM=leds\u0000DEVPATH=/xyz/leds/abc::no_backlight\u0000" @@ -504,260 +384,160 @@ class KeyboardBacklightControllerTests { @Test @UiThreadTest fun testKeyboardBacklightAnimation_onChangeLevels() { - KeyboardBacklightFlags( - animationEnabled = true, - customLevelsEnabled = false, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - incrementKeyboardBacklight(DEVICE_ID) - assertEquals( - "Should start animation from level 0", - DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[0], - lastAnimationValues[0] - ) - assertEquals( - "Should start animation to level 1", - DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], - lastAnimationValues[1] - ) + ExtendedMockito.doReturn("true").`when` { + SystemProperties.get(eq("persist.input.keyboard.backlight_animation.enabled")) } + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + incrementKeyboardBacklight(DEVICE_ID) + assertEquals( + "Should start animation from level 0", + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[0], + lastAnimationValues[0] + ) + assertEquals( + "Should start animation to level 1", + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], + lastAnimationValues[1] + ) } @Test fun testKeyboardBacklightPreferredLevels() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = true, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val suggestedLevels = intArrayOf(0, 22, 63, 135, 196, 255) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, - suggestedLevels) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, - suggestedLevels) - } + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val suggestedLevels = intArrayOf(0, 22, 63, 135, 196, 255) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, + suggestedLevels) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, suggestedLevels) } @Test fun testKeyboardBacklightPreferredLevels_moreThanMax_shouldUseDefault() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = true, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val suggestedLevels = IntArray(MAX_BRIGHTNESS_CHANGE_STEPS + 1) { 10 * (it + 1) } - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, - suggestedLevels) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, - DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL) - } + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val suggestedLevels = IntArray(MAX_BRIGHTNESS_CHANGE_STEPS + 1) { 10 * (it + 1) } + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, + suggestedLevels) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL) } @Test fun testKeyboardBacklightPreferredLevels_mustHaveZeroAndMaxBrightnessAsBounds() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = true, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val suggestedLevels = intArrayOf(22, 63, 135, 196) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, - suggestedLevels) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - // Framework will add the lowest and maximum levels if not provided via config - assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, - intArrayOf(0, 22, 63, 135, 196, 255)) - } + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val suggestedLevels = intArrayOf(22, 63, 135, 196) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, + suggestedLevels) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + // Framework will add the lowest and maximum levels if not provided via config + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + intArrayOf(0, 22, 63, 135, 196, 255)) } @Test fun testKeyboardBacklightPreferredLevels_dropsOutOfBoundsLevels() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = true, - ambientControlEnabled = false - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val suggestedLevels = intArrayOf(22, 63, 135, 400, 196, 1000) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, - suggestedLevels) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)) - .thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - - // Framework will drop out of bound levels in the config - assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, - intArrayOf(0, 22, 63, 135, 196, 255)) - } - } - - @Test - fun testAmbientBacklightControl_doesntRestoreBacklightLevel() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = true - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - - dataStore.setKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, - LIGHT_ID, - DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1] - ) - - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - keyboardBacklightController.notifyUserActivity() - testLooper.dispatchNext() - assertNull( - "Keyboard backlight level should not be restored to the saved level", - lightColorMap[LIGHT_ID] - ) - } - } - - @Test - fun testAmbientBacklightControl_doesntBackupBacklightLevel() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = true - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - incrementKeyboardBacklight(DEVICE_ID) - assertFalse( - "Light value should not be backed up if ambient control is enabled", - dataStore.getKeyboardBacklightBrightness( - keyboardWithBacklight.descriptor, LIGHT_ID - ).isPresent - ) - } + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val suggestedLevels = intArrayOf(22, 63, 135, 400, 196, 1000) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT, + suggestedLevels) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + + // Framework will drop out of bound levels in the config + assertIncrementDecrementForLevels(keyboardWithBacklight, keyboardBacklight, + intArrayOf(0, 22, 63, 135, 196, 255)) } @Test fun testAmbientBacklightControl_incrementLevel_afterAmbientChange() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = true - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - sendAmbientBacklightValue(1) - assertEquals( - "Light value should be changed to ambient provided value", - Color.argb(1, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + sendAmbientBacklightValue(1) + assertEquals( + "Light value should be changed to ambient provided value", + Color.argb(1, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) - incrementKeyboardBacklight(DEVICE_ID) + incrementKeyboardBacklight(DEVICE_ID) - assertEquals( - "Light value for level after increment post Ambient change is mismatched", - Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - } + assertEquals( + "Light value for level after increment post Ambient change is mismatched", + Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], 0, 0, 0), + lightColorMap[LIGHT_ID] + ) } @Test fun testAmbientBacklightControl_decrementLevel_afterAmbientChange() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = true - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - sendAmbientBacklightValue(254) - assertEquals( - "Light value should be changed to ambient provided value", - Color.argb(254, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + sendAmbientBacklightValue(254) + assertEquals( + "Light value should be changed to ambient provided value", + Color.argb(254, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) - decrementKeyboardBacklight(DEVICE_ID) + decrementKeyboardBacklight(DEVICE_ID) - val numLevels = DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL.size - assertEquals( - "Light value for level after decrement post Ambient change is mismatched", - Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[numLevels - 2], 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - } + val numLevels = DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL.size + assertEquals( + "Light value for level after decrement post Ambient change is mismatched", + Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[numLevels - 2], 0, 0, 0), + lightColorMap[LIGHT_ID] + ) } @Test fun testAmbientBacklightControl_ambientChanges_afterManualChange() { - KeyboardBacklightFlags( - animationEnabled = false, - customLevelsEnabled = false, - ambientControlEnabled = true - ).use { - val keyboardWithBacklight = createKeyboard(DEVICE_ID) - val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) - `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)) - .thenReturn(keyboardWithBacklight) - `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) - keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) - incrementKeyboardBacklight(DEVICE_ID) - assertEquals( - "Light value should be changed to the first level", - Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], 0, 0, 0), - lightColorMap[LIGHT_ID] - ) + setupController() + val keyboardWithBacklight = createKeyboard(DEVICE_ID) + val keyboardBacklight = createLight(LIGHT_ID, Light.LIGHT_TYPE_KEYBOARD_BACKLIGHT) + `when`(inputManagerRule.mock.getInputDevice(DEVICE_ID)).thenReturn(keyboardWithBacklight) + `when`(inputManagerRule.mock.getLights(DEVICE_ID)).thenReturn(listOf(keyboardBacklight)) + keyboardBacklightController.onInputDeviceAdded(DEVICE_ID) + incrementKeyboardBacklight(DEVICE_ID) + assertEquals( + "Light value should be changed to the first level", + Color.argb(DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL[1], 0, 0, 0), + lightColorMap[LIGHT_ID] + ) - sendAmbientBacklightValue(100) - assertNotEquals( - "Light value should not change based on ambient changes after manual changes", - Color.argb(100, 0, 0, 0), - lightColorMap[LIGHT_ID] - ) - } + sendAmbientBacklightValue(100) + assertNotEquals( + "Light value should not change based on ambient changes after manual changes", + Color.argb(100, 0, 0, 0), + lightColorMap[LIGHT_ID] + ) } private fun assertIncrementDecrementForLevels( @@ -774,11 +554,6 @@ class KeyboardBacklightControllerTests { Color.argb(expectedLevels[level], 0, 0, 0), lightColorMap[lightId] ) - assertEquals( - "Light value for level $level must be correctly stored in the datastore", - expectedLevels[level], - dataStore.getKeyboardBacklightBrightness(device.descriptor, lightId).asInt - ) } // Increment above max level @@ -788,11 +563,6 @@ class KeyboardBacklightControllerTests { Color.argb(MAX_BRIGHTNESS, 0, 0, 0), lightColorMap[lightId] ) - assertEquals( - "Light value for max level must be correctly stored in the datastore", - MAX_BRIGHTNESS, - dataStore.getKeyboardBacklightBrightness(device.descriptor, lightId).asInt - ) for (level in expectedLevels.size - 2 downTo 0) { decrementKeyboardBacklight(deviceId) @@ -801,11 +571,6 @@ class KeyboardBacklightControllerTests { Color.argb(expectedLevels[level], 0, 0, 0), lightColorMap[lightId] ) - assertEquals( - "Light value for level $level must be correctly stored in the datastore", - expectedLevels[level], - dataStore.getKeyboardBacklightBrightness(device.descriptor, lightId).asInt - ) } // Decrement below min level @@ -815,11 +580,6 @@ class KeyboardBacklightControllerTests { Color.argb(0, 0, 0, 0), lightColorMap[lightId] ) - assertEquals( - "Light value for min level must be correctly stored in the datastore", - 0, - dataStore.getKeyboardBacklightBrightness(device.descriptor, lightId).asInt - ) } inner class KeyboardBacklightListener : IKeyboardBacklightListener.Stub() { @@ -862,23 +622,6 @@ class KeyboardBacklightControllerTests { val isTriggeredByKeyPress: Boolean ) - private inner class KeyboardBacklightFlags constructor( - animationEnabled: Boolean, - customLevelsEnabled: Boolean, - ambientControlEnabled: Boolean - ) : AutoCloseable { - init { - InputFeatureFlagProvider.setKeyboardBacklightAnimationEnabled(animationEnabled) - InputFeatureFlagProvider.setKeyboardBacklightCustomLevelsEnabled(customLevelsEnabled) - InputFeatureFlagProvider - .setAmbientKeyboardBacklightControlEnabled(ambientControlEnabled) - } - - override fun close() { - InputFeatureFlagProvider.clearOverrides() - } - } - private inner class FakeAnimatorFactory : KeyboardBacklightController.AnimatorFactory { override fun makeIntAnimator(from: Int, to: Int): ValueAnimator { lastAnimationValues[0] = from diff --git a/tests/NetworkSecurityConfigTest/res/xml/ct_domains.xml b/tests/NetworkSecurityConfigTest/res/xml/ct_domains.xml new file mode 100644 index 000000000000..67d4397afe7d --- /dev/null +++ b/tests/NetworkSecurityConfigTest/res/xml/ct_domains.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<network-security-config> + <base-config> + <certificateTransparency enabled="true" /> + </base-config> + <domain-config> + <domain>android.com</domain> + <trust-anchors> + <certificates src="system" /> + </trust-anchors> + </domain-config> + <domain-config> + <domain>subdomain_user.android.com</domain> + <trust-anchors> + <certificates src="user" /> + </trust-anchors> + </domain-config> + <domain-config> + <certificateTransparency enabled="true" /> + <domain>subdomain_user_ct.android.com</domain> + <trust-anchors> + <certificates src="user" /> + </trust-anchors> + </domain-config> + <domain-config> + <domain>subdomain_inline.android.com</domain> + <trust-anchors> + <certificates src="@raw/ca_certs_pem" /> + </trust-anchors> + </domain-config> + <domain-config> + <certificateTransparency enabled="true" /> + <domain>subdomain_inline_ct.android.com</domain> + <trust-anchors> + <certificates src="@raw/ca_certs_pem" /> + </trust-anchors> + </domain-config> +</network-security-config> diff --git a/tests/NetworkSecurityConfigTest/res/xml/ct_users.xml b/tests/NetworkSecurityConfigTest/res/xml/ct_users.xml new file mode 100644 index 000000000000..c35fd71c3178 --- /dev/null +++ b/tests/NetworkSecurityConfigTest/res/xml/ct_users.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<network-security-config> + <base-config> + <trust-anchors> + <certificates src="user" /> + </trust-anchors> + </base-config> + <domain-config> + <domain>android.com</domain> + </domain-config> + <domain-config> + <certificateTransparency enabled="true" /> + <domain>subdomain.android.com</domain> + </domain-config> +</network-security-config> diff --git a/tests/NetworkSecurityConfigTest/src/android/security/net/config/NetworkSecurityConfigTests.java b/tests/NetworkSecurityConfigTest/src/android/security/net/config/NetworkSecurityConfigTests.java index 0494f174f191..c6fe06858e3f 100644 --- a/tests/NetworkSecurityConfigTest/src/android/security/net/config/NetworkSecurityConfigTests.java +++ b/tests/NetworkSecurityConfigTest/src/android/security/net/config/NetworkSecurityConfigTests.java @@ -111,7 +111,8 @@ public class NetworkSecurityConfigTests extends ActivityUnitTestCase<Activity> { private NetworkSecurityConfig getSystemStoreConfig() { return new NetworkSecurityConfig.Builder() .addCertificatesEntryRef( - new CertificatesEntryRef(SystemCertificateSource.getInstance(), false)) + new CertificatesEntryRef( + SystemCertificateSource.getInstance(), false, false)) .build(); } @@ -141,7 +142,8 @@ public class NetworkSecurityConfigTests extends ActivityUnitTestCase<Activity> { NetworkSecurityConfig domain = new NetworkSecurityConfig.Builder() .setPinSet(new PinSet(pins, Long.MAX_VALUE)) .addCertificatesEntryRef( - new CertificatesEntryRef(SystemCertificateSource.getInstance(), false)) + new CertificatesEntryRef( + SystemCertificateSource.getInstance(), false, false)) .build(); ArraySet<Pair<Domain, NetworkSecurityConfig>> domainMap = new ArraySet<Pair<Domain, NetworkSecurityConfig>>(); @@ -159,7 +161,8 @@ public class NetworkSecurityConfigTests extends ActivityUnitTestCase<Activity> { NetworkSecurityConfig domain = new NetworkSecurityConfig.Builder() .setPinSet(new PinSet(pins, Long.MAX_VALUE)) .addCertificatesEntryRef( - new CertificatesEntryRef(SystemCertificateSource.getInstance(), false)) + new CertificatesEntryRef( + SystemCertificateSource.getInstance(), false, false)) .build(); ArraySet<Pair<Domain, NetworkSecurityConfig>> domainMap = new ArraySet<Pair<Domain, NetworkSecurityConfig>>(); @@ -178,7 +181,8 @@ public class NetworkSecurityConfigTests extends ActivityUnitTestCase<Activity> { NetworkSecurityConfig domain = new NetworkSecurityConfig.Builder() .setPinSet(new PinSet(pins, Long.MAX_VALUE)) .addCertificatesEntryRef( - new CertificatesEntryRef(SystemCertificateSource.getInstance(), true)) + new CertificatesEntryRef( + SystemCertificateSource.getInstance(), true, false)) .build(); ArraySet<Pair<Domain, NetworkSecurityConfig>> domainMap = new ArraySet<Pair<Domain, NetworkSecurityConfig>>(); @@ -245,7 +249,8 @@ public class NetworkSecurityConfigTests extends ActivityUnitTestCase<Activity> { NetworkSecurityConfig domain = new NetworkSecurityConfig.Builder() .setPinSet(new PinSet(pins, Long.MAX_VALUE)) .addCertificatesEntryRef( - new CertificatesEntryRef(SystemCertificateSource.getInstance(), false)) + new CertificatesEntryRef( + SystemCertificateSource.getInstance(), false, false)) .build(); ArraySet<Pair<Domain, NetworkSecurityConfig>> domainMap = new ArraySet<Pair<Domain, NetworkSecurityConfig>>(); diff --git a/tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java b/tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java index 81e05c1d4e42..542465d62a66 100644 --- a/tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java +++ b/tests/NetworkSecurityConfigTest/src/android/security/net/config/XmlConfigTests.java @@ -502,4 +502,47 @@ public class XmlConfigTests extends AndroidTestCase { TestUtils.assertConnectionSucceeds(context, "android.com", 443); TestUtils.assertConnectionSucceeds(context, "developer.android.com", 443); } + + public void testCertificateTransparencyDomainConfig() throws Exception { + XmlConfigSource source = new XmlConfigSource(getContext(), R.xml.ct_domains, + TestUtils.makeApplicationInfo()); + ApplicationConfig appConfig = new ApplicationConfig(source); + assertTrue(appConfig.hasPerDomainConfigs()); + NetworkSecurityConfig config = appConfig.getConfigForHostname(""); + assertNotNull(config); + // Check defaults. + assertTrue(config.isCertificateTransparencyVerificationRequired()); + + config = appConfig.getConfigForHostname("android.com"); + assertTrue(config.isCertificateTransparencyVerificationRequired()); + + config = appConfig.getConfigForHostname("subdomain_user.android.com"); + assertFalse(config.isCertificateTransparencyVerificationRequired()); + + config = appConfig.getConfigForHostname("subdomain_user_ct.android.com"); + assertTrue(config.isCertificateTransparencyVerificationRequired()); + + config = appConfig.getConfigForHostname("subdomain_inline.android.com"); + assertFalse(config.isCertificateTransparencyVerificationRequired()); + + config = appConfig.getConfigForHostname("subdomain_inline_ct.android.com"); + assertTrue(config.isCertificateTransparencyVerificationRequired()); + } + + public void testCertificateTransparencyUserConfig() throws Exception { + XmlConfigSource source = new XmlConfigSource(getContext(), R.xml.ct_users, + TestUtils.makeApplicationInfo()); + ApplicationConfig appConfig = new ApplicationConfig(source); + assertTrue(appConfig.hasPerDomainConfigs()); + NetworkSecurityConfig config = appConfig.getConfigForHostname(""); + assertNotNull(config); + // Check defaults. + assertFalse(config.isCertificateTransparencyVerificationRequired()); + + config = appConfig.getConfigForHostname("android.com"); + assertFalse(config.isCertificateTransparencyVerificationRequired()); + + config = appConfig.getConfigForHostname("subdomain.android.com"); + assertTrue(config.isCertificateTransparencyVerificationRequired()); + } } diff --git a/tests/PackageWatchdog/src/com/android/server/CrashRecoveryTest.java b/tests/PackageWatchdog/src/com/android/server/CrashRecoveryTest.java index af87bf724a30..49616c30b784 100644 --- a/tests/PackageWatchdog/src/com/android/server/CrashRecoveryTest.java +++ b/tests/PackageWatchdog/src/com/android/server/CrashRecoveryTest.java @@ -83,6 +83,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Set; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; @@ -112,6 +113,7 @@ public class CrashRecoveryTest { private final TestClock mTestClock = new TestClock(); private TestLooper mTestLooper; + private Executor mTestExecutor; private Context mSpyContext; // Keep track of all created watchdogs to apply device config changes private List<PackageWatchdog> mAllocatedWatchdogs; @@ -141,6 +143,7 @@ public class CrashRecoveryTest { Manifest.permission.WRITE_DEVICE_CONFIG, Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG); mTestLooper = new TestLooper(); + mTestExecutor = mTestLooper.getNewExecutor(); mSpyContext = spy(InstrumentationRegistry.getContext()); when(mSpyContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).then(inv -> { @@ -231,31 +234,37 @@ public class CrashRecoveryTest { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(2); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(3); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(3); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(4); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(4); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(5); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(5); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(6); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(6); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(7); } @@ -272,6 +281,7 @@ public class CrashRecoveryTest { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); verify(rollbackObserver).onExecuteBootLoopMitigation(1); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); @@ -281,6 +291,7 @@ public class CrashRecoveryTest { watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rollbackObserver).onExecuteBootLoopMitigation(2); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); @@ -289,6 +300,7 @@ public class CrashRecoveryTest { watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); } @@ -305,18 +317,21 @@ public class CrashRecoveryTest { for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(1); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(2); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(3); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(3); verify(rollbackObserver).onExecuteBootLoopMitigation(1); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); @@ -326,24 +341,28 @@ public class CrashRecoveryTest { watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(3); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(4); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(4); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(5); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(5); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(6); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(6); verify(rollbackObserver).onExecuteBootLoopMitigation(2); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); @@ -352,6 +371,7 @@ public class CrashRecoveryTest { watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(6); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(7); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); @@ -362,6 +382,7 @@ public class CrashRecoveryTest { for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); } @@ -379,12 +400,14 @@ public class CrashRecoveryTest { for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(1); watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); verify(rollbackObserver).onExecuteBootLoopMitigation(1); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(2); @@ -394,6 +417,7 @@ public class CrashRecoveryTest { watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); verify(rollbackObserver).onExecuteBootLoopMitigation(2); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); @@ -402,6 +426,7 @@ public class CrashRecoveryTest { watchdog.noteBoot(); + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(2); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(3); verify(rollbackObserver, never()).onExecuteBootLoopMitigation(3); @@ -412,6 +437,7 @@ public class CrashRecoveryTest { for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); verify(rescuePartyObserver).onExecuteBootLoopMitigation(1); verify(rescuePartyObserver, never()).onExecuteBootLoopMitigation(2); } @@ -739,14 +765,14 @@ public class CrashRecoveryTest { } catch (PackageManager.NameNotFoundException e) { throw new RuntimeException(e); } - watchdog.registerHealthObserver(rollbackObserver); + watchdog.registerHealthObserver(rollbackObserver, mTestExecutor); return rollbackObserver; } RescuePartyObserver setUpRescuePartyObserver(PackageWatchdog watchdog) { setCrashRecoveryPropRescueBootCount(0); RescuePartyObserver rescuePartyObserver = spy(RescuePartyObserver.getInstance(mSpyContext)); assertFalse(RescueParty.isRebootPropertySet()); - watchdog.registerHealthObserver(rescuePartyObserver); + watchdog.registerHealthObserver(rescuePartyObserver, mTestExecutor); return rescuePartyObserver; } diff --git a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java index 5a8a6bedf9eb..c64dc7296f0a 100644 --- a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java +++ b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java @@ -53,6 +53,7 @@ import android.platform.test.flag.junit.SetFlagsRule; import android.provider.DeviceConfig; import android.util.AtomicFile; import android.util.LongArrayQueue; +import android.util.Slog; import android.util.Xml; import androidx.test.InstrumentationRegistry; @@ -88,6 +89,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Set; +import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Supplier; @@ -119,6 +121,7 @@ public class PackageWatchdogTest { private final TestClock mTestClock = new TestClock(); private TestLooper mTestLooper; + private Executor mTestExecutor; private Context mSpyContext; // Keep track of all created watchdogs to apply device config changes private List<PackageWatchdog> mAllocatedWatchdogs; @@ -155,6 +158,7 @@ public class PackageWatchdogTest { Manifest.permission.WRITE_DEVICE_CONFIG, Manifest.permission.WRITE_ALLOWLISTED_DEVICE_CONFIG); mTestLooper = new TestLooper(); + mTestExecutor = mTestLooper.getNewExecutor(); mSpyContext = spy(InstrumentationRegistry.getContext()); when(mSpyContext.getPackageManager()).thenReturn(mMockPackageManager); when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).then(inv -> { @@ -226,7 +230,8 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_UNKNOWN); @@ -242,8 +247,10 @@ public class PackageWatchdogTest { TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); TestObserver observer2 = new TestObserver(OBSERVER_NAME_2); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer2, Arrays.asList(APP_A, APP_B), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_A, APP_B), SHORT_DURATION); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE), new VersionedPackage(APP_B, VERSION_CODE)), @@ -260,7 +267,8 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION); watchdog.unregisterHealthObserver(observer); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), @@ -276,8 +284,10 @@ public class PackageWatchdogTest { TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); TestObserver observer2 = new TestObserver(OBSERVER_NAME_2); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer2, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_A), SHORT_DURATION); watchdog.unregisterHealthObserver(observer2); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), @@ -294,7 +304,8 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION); moveTimeForwardAndDispatch(SHORT_DURATION); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), @@ -310,8 +321,10 @@ public class PackageWatchdogTest { TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); TestObserver observer2 = new TestObserver(OBSERVER_NAME_2); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer2, Arrays.asList(APP_A), LONG_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_A), LONG_DURATION); moveTimeForwardAndDispatch(SHORT_DURATION); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), @@ -330,13 +343,14 @@ public class PackageWatchdogTest { TestObserver observer = new TestObserver(OBSERVER_NAME_1); // Start observing APP_A - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION); // Then advance time half-way moveTimeForwardAndDispatch(SHORT_DURATION / 2); // Start observing APP_A again - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION); // Then advance time such that it should have expired were it not for the second observation moveTimeForwardAndDispatch((SHORT_DURATION / 2) + 1); @@ -358,15 +372,17 @@ public class PackageWatchdogTest { TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); TestObserver observer2 = new TestObserver(OBSERVER_NAME_2); - watchdog1.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); - watchdog1.startObservingHealth(observer2, Arrays.asList(APP_A, APP_B), SHORT_DURATION); + watchdog1.registerHealthObserver(observer1, mTestExecutor); + watchdog1.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog1.registerHealthObserver(observer2, mTestExecutor); + watchdog1.startExplicitHealthCheck(observer2, Arrays.asList(APP_A, APP_B), SHORT_DURATION); // Then advance time and run IO Handler so file is saved mTestLooper.dispatchAll(); // Then start a new watchdog PackageWatchdog watchdog2 = createWatchdog(); // Then resume observer1 and observer2 - watchdog2.registerHealthObserver(observer1); - watchdog2.registerHealthObserver(observer2); + watchdog2.registerHealthObserver(observer1, mTestExecutor); + watchdog2.registerHealthObserver(observer2, mTestExecutor); raiseFatalFailureAndDispatch(watchdog2, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE), new VersionedPackage(APP_B, VERSION_CODE)), @@ -374,6 +390,7 @@ public class PackageWatchdogTest { // We should receive failed packages as expected to ensure observers are persisted and // resumed correctly + mTestLooper.dispatchAll(); assertThat(observer1.mHealthCheckFailedPackages).containsExactly(APP_A); assertThat(observer2.mHealthCheckFailedPackages).containsExactly(APP_A, APP_B); } @@ -387,8 +404,10 @@ public class PackageWatchdogTest { TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); TestObserver observer2 = new TestObserver(OBSERVER_NAME_2); - watchdog.startObservingHealth(observer2, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); // Then fail APP_A below the threshold for (int i = 0; i < watchdog.getTriggerFailureCount() - 1; i++) { @@ -414,9 +433,10 @@ public class PackageWatchdogTest { TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); TestObserver observer2 = new TestObserver(OBSERVER_NAME_2); - - watchdog.startObservingHealth(observer2, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_B), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_B), SHORT_DURATION); // Then fail APP_C (not observed) above the threshold raiseFatalFailureAndDispatch(watchdog, @@ -448,7 +468,8 @@ public class PackageWatchdogTest { } }; - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION); // Then fail APP_A (different version) above the threshold raiseFatalFailureAndDispatch(watchdog, @@ -477,13 +498,17 @@ public class PackageWatchdogTest { PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); // Start observing for all impact observers - watchdog.startObservingHealth(observerNone, Arrays.asList(APP_A, APP_B, APP_C, APP_D), + watchdog.registerHealthObserver(observerNone, mTestExecutor); + watchdog.startExplicitHealthCheck(observerNone, Arrays.asList(APP_A, APP_B, APP_C, APP_D), SHORT_DURATION); - watchdog.startObservingHealth(observerHigh, Arrays.asList(APP_A, APP_B, APP_C), + watchdog.registerHealthObserver(observerHigh, mTestExecutor); + watchdog.startExplicitHealthCheck(observerHigh, Arrays.asList(APP_A, APP_B, APP_C), SHORT_DURATION); - watchdog.startObservingHealth(observerMid, Arrays.asList(APP_A, APP_B), + watchdog.registerHealthObserver(observerMid, mTestExecutor); + watchdog.startExplicitHealthCheck(observerMid, Arrays.asList(APP_A, APP_B), SHORT_DURATION); - watchdog.startObservingHealth(observerLow, Arrays.asList(APP_A), + watchdog.registerHealthObserver(observerLow, mTestExecutor); + watchdog.startExplicitHealthCheck(observerLow, Arrays.asList(APP_A), SHORT_DURATION); // Then fail all apps above the threshold @@ -523,13 +548,17 @@ public class PackageWatchdogTest { PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); // Start observing for all impact observers - watchdog.startObservingHealth(observerNone, Arrays.asList(APP_A, APP_B, APP_C, APP_D), + watchdog.registerHealthObserver(observerNone, mTestExecutor); + watchdog.startExplicitHealthCheck(observerNone, Arrays.asList(APP_A, APP_B, APP_C, APP_D), SHORT_DURATION); - watchdog.startObservingHealth(observerHigh, Arrays.asList(APP_A, APP_B, APP_C), + watchdog.registerHealthObserver(observerHigh, mTestExecutor); + watchdog.startExplicitHealthCheck(observerHigh, Arrays.asList(APP_A, APP_B, APP_C), SHORT_DURATION); - watchdog.startObservingHealth(observerMid, Arrays.asList(APP_A, APP_B), + watchdog.registerHealthObserver(observerMid, mTestExecutor); + watchdog.startExplicitHealthCheck(observerMid, Arrays.asList(APP_A, APP_B), SHORT_DURATION); - watchdog.startObservingHealth(observerLow, Arrays.asList(APP_A), + watchdog.registerHealthObserver(observerLow, mTestExecutor); + watchdog.startExplicitHealthCheck(observerLow, Arrays.asList(APP_A), SHORT_DURATION); // Then fail all apps above the threshold @@ -577,8 +606,10 @@ public class PackageWatchdogTest { PackageHealthObserverImpact.USER_IMPACT_LEVEL_30); // Start observing for observerFirst and observerSecond with failure handling - watchdog.startObservingHealth(observerFirst, Arrays.asList(APP_A), LONG_DURATION); - watchdog.startObservingHealth(observerSecond, Arrays.asList(APP_A), LONG_DURATION); + watchdog.registerHealthObserver(observerFirst, mTestExecutor); + watchdog.startExplicitHealthCheck(observerFirst, Arrays.asList(APP_A), LONG_DURATION); + watchdog.registerHealthObserver(observerSecond, mTestExecutor); + watchdog.startExplicitHealthCheck(observerSecond, Arrays.asList(APP_A), LONG_DURATION); // Then fail APP_A above the threshold raiseFatalFailureAndDispatch(watchdog, @@ -641,8 +672,10 @@ public class PackageWatchdogTest { PackageHealthObserverImpact.USER_IMPACT_LEVEL_30); // Start observing for observerFirst and observerSecond with failure handling - watchdog.startObservingHealth(observerFirst, Arrays.asList(APP_A), LONG_DURATION); - watchdog.startObservingHealth(observerSecond, Arrays.asList(APP_A), LONG_DURATION); + watchdog.registerHealthObserver(observerFirst, mTestExecutor); + watchdog.startExplicitHealthCheck(observerFirst, Arrays.asList(APP_A), LONG_DURATION); + watchdog.registerHealthObserver(observerSecond, mTestExecutor); + watchdog.startExplicitHealthCheck(observerSecond, Arrays.asList(APP_A), LONG_DURATION); // Then fail APP_A above the threshold raiseFatalFailureAndDispatch(watchdog, @@ -709,8 +742,10 @@ public class PackageWatchdogTest { PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); // Start observing for observer1 and observer2 with failure handling - watchdog.startObservingHealth(observer2, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); // Then fail APP_A above the threshold raiseFatalFailureAndDispatch(watchdog, @@ -731,8 +766,10 @@ public class PackageWatchdogTest { PackageHealthObserverImpact.USER_IMPACT_LEVEL_50); // Start observing for observer1 and observer2 with failure handling - watchdog.startObservingHealth(observer2, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); // Then fail APP_A above the threshold raiseFatalFailureAndDispatch(watchdog, @@ -762,8 +799,10 @@ public class PackageWatchdogTest { // Start observing with explicit health checks for APP_A and APP_B respectively // with observer1 and observer2 controller.setSupportedPackages(Arrays.asList(APP_A, APP_B)); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer2, Arrays.asList(APP_B), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_B), SHORT_DURATION); // Run handler so requests are dispatched to the controller mTestLooper.dispatchAll(); @@ -779,7 +818,8 @@ public class PackageWatchdogTest { // Observer3 didn't exist when we got the explicit health check above, so // it starts out with a non-passing explicit health check and has to wait for a pass // otherwise it would be notified of APP_A failure on expiry - watchdog.startObservingHealth(observer3, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer3, mTestExecutor); + watchdog.startExplicitHealthCheck(observer3, Arrays.asList(APP_A), SHORT_DURATION); // Then expire observers moveTimeForwardAndDispatch(SHORT_DURATION); @@ -809,8 +849,9 @@ public class PackageWatchdogTest { // Start observing with explicit health checks for APP_A and APP_B controller.setSupportedPackages(Arrays.asList(APP_A, APP_B, APP_C)); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer, Arrays.asList(APP_B), LONG_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_B), LONG_DURATION); // Run handler so requests are dispatched to the controller mTestLooper.dispatchAll(); @@ -846,7 +887,7 @@ public class PackageWatchdogTest { // Then set new supported packages controller.setSupportedPackages(Arrays.asList(APP_C)); // Start observing APP_A and APP_C; only APP_C has support for explicit health checks - watchdog.startObservingHealth(observer, Arrays.asList(APP_A, APP_C), SHORT_DURATION); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A, APP_C), SHORT_DURATION); // Run handler so requests/cancellations are dispatched to the controller mTestLooper.dispatchAll(); @@ -877,7 +918,8 @@ public class PackageWatchdogTest { // package observation duration == LONG_DURATION // health check duration == SHORT_DURATION (set by default in the TestController) controller.setSupportedPackages(Arrays.asList(APP_A)); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), LONG_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), LONG_DURATION); // Then APP_A has exceeded health check duration moveTimeForwardAndDispatch(SHORT_DURATION); @@ -908,7 +950,8 @@ public class PackageWatchdogTest { // package observation duration == SHORT_DURATION / 2 // health check duration == SHORT_DURATION (set by default in the TestController) controller.setSupportedPackages(Arrays.asList(APP_A)); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION / 2); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION / 2); // Forward time to expire the observation duration moveTimeForwardAndDispatch(SHORT_DURATION / 2); @@ -981,7 +1024,7 @@ public class PackageWatchdogTest { // Start observing with failure handling TestObserver observer = new TestObserver(OBSERVER_NAME_1, PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); - wd.startObservingHealth(observer, Collections.singletonList(APP_A), SHORT_DURATION); + wd.startExplicitHealthCheck(observer, Collections.singletonList(APP_A), SHORT_DURATION); // Notify of NetworkStack failure mConnectivityModuleCallbackCaptor.getValue().onNetworkStackFailure(APP_A); @@ -1001,7 +1044,7 @@ public class PackageWatchdogTest { // Start observing with failure handling TestObserver observer = new TestObserver(OBSERVER_NAME_1, PackageHealthObserverImpact.USER_IMPACT_LEVEL_100); - wd.startObservingHealth(observer, Collections.singletonList(APP_A), SHORT_DURATION); + wd.startExplicitHealthCheck(observer, Collections.singletonList(APP_A), SHORT_DURATION); // Notify of NetworkStack failure mConnectivityModuleCallbackCaptor.getValue().onNetworkStackFailure(APP_A); @@ -1022,7 +1065,8 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), SHORT_DURATION); // Fail APP_A below the threshold which should not trigger package failures for (int i = 0; i < PackageWatchdog.DEFAULT_TRIGGER_FAILURE_COUNT - 1; i++) { watchdog.notifyPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), @@ -1050,7 +1094,8 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A, APP_B), Long.MAX_VALUE); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A, APP_B), Long.MAX_VALUE); watchdog.notifyPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_UNKNOWN); moveTimeForwardAndDispatch(PackageWatchdog.DEFAULT_TRIGGER_FAILURE_DURATION_MS + 1); @@ -1075,15 +1120,16 @@ public class PackageWatchdogTest { } /** - * Test default monitoring duration is used when PackageWatchdog#startObservingHealth is offered - * an invalid durationMs. + * Test default monitoring duration is used when PackageWatchdog#startExplicitHealthCheck is + * offered an invalid durationMs. */ @Test public void testInvalidMonitoringDuration_beforeExpiry() { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), -1); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), -1); // Note: Don't move too close to the expiration time otherwise the handler will be thrashed // by PackageWatchdog#scheduleNextSyncStateLocked which keeps posting runnables with very // small timeouts. @@ -1097,15 +1143,16 @@ public class PackageWatchdogTest { } /** - * Test default monitoring duration is used when PackageWatchdog#startObservingHealth is offered - * an invalid durationMs. + * Test default monitoring duration is used when PackageWatchdog#startExplicitHealthCheck is + * offered an invalid durationMs. */ @Test public void testInvalidMonitoringDuration_afterExpiry() { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), -1); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), -1); moveTimeForwardAndDispatch(PackageWatchdog.DEFAULT_OBSERVING_DURATION_MS + 1); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), @@ -1127,7 +1174,8 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, Arrays.asList(APP_A), Long.MAX_VALUE); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, Arrays.asList(APP_A), Long.MAX_VALUE); // Raise 2 failures at t=0 and t=900 respectively watchdog.notifyPackageFailure(Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_UNKNOWN); @@ -1154,8 +1202,10 @@ public class PackageWatchdogTest { TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); TestObserver observer2 = new TestObserver(OBSERVER_NAME_2); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); - watchdog.startObservingHealth(observer2, Arrays.asList(APP_B), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer2, mTestExecutor); + watchdog.startExplicitHealthCheck(observer2, Arrays.asList(APP_B), SHORT_DURATION); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_APP_CRASH); @@ -1174,7 +1224,8 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer1, Arrays.asList(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, Arrays.asList(APP_A), SHORT_DURATION); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_NATIVE_CRASH); @@ -1194,7 +1245,8 @@ public class PackageWatchdogTest { persistentObserver.setPersistent(true); persistentObserver.setMayObservePackages(true); - watchdog.startObservingHealth(persistentObserver, Arrays.asList(APP_B), SHORT_DURATION); + watchdog.registerHealthObserver(persistentObserver, mTestExecutor); + watchdog.startExplicitHealthCheck(persistentObserver, Arrays.asList(APP_B), SHORT_DURATION); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_UNKNOWN); @@ -1212,7 +1264,8 @@ public class PackageWatchdogTest { persistentObserver.setPersistent(true); persistentObserver.setMayObservePackages(false); - watchdog.startObservingHealth(persistentObserver, Arrays.asList(APP_B), SHORT_DURATION); + watchdog.registerHealthObserver(persistentObserver, mTestExecutor); + watchdog.startExplicitHealthCheck(persistentObserver, Arrays.asList(APP_B), SHORT_DURATION); raiseFatalFailureAndDispatch(watchdog, Arrays.asList(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_UNKNOWN); @@ -1223,13 +1276,15 @@ public class PackageWatchdogTest { /** Ensure that boot loop mitigation is done when the number of boots meets the threshold. */ @Test public void testBootLoopDetection_meetsThreshold() { + Slog.w("hrm1243", "I should definitely be here try 1 "); mSetFlagsRule.disableFlags(Flags.FLAG_RECOVERABILITY_DETECTION); PackageWatchdog watchdog = createWatchdog(); TestObserver bootObserver = new TestObserver(OBSERVER_NAME_1); - watchdog.registerHealthObserver(bootObserver); + watchdog.registerHealthObserver(bootObserver, mTestExecutor); for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); assertThat(bootObserver.mitigatedBootLoop()).isTrue(); } @@ -1237,10 +1292,11 @@ public class PackageWatchdogTest { public void testBootLoopDetection_meetsThresholdRecoverability() { PackageWatchdog watchdog = createWatchdog(); TestObserver bootObserver = new TestObserver(OBSERVER_NAME_1); - watchdog.registerHealthObserver(bootObserver); + watchdog.registerHealthObserver(bootObserver, mTestExecutor); for (int i = 0; i < 15; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); assertThat(bootObserver.mitigatedBootLoop()).isTrue(); } @@ -1252,10 +1308,11 @@ public class PackageWatchdogTest { public void testBootLoopDetection_doesNotMeetThreshold() { PackageWatchdog watchdog = createWatchdog(); TestObserver bootObserver = new TestObserver(OBSERVER_NAME_1); - watchdog.registerHealthObserver(bootObserver); + watchdog.registerHealthObserver(bootObserver, mTestExecutor); for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT - 1; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); assertThat(bootObserver.mitigatedBootLoop()).isFalse(); } @@ -1268,10 +1325,11 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver bootObserver = new TestObserver(OBSERVER_NAME_1, PackageHealthObserverImpact.USER_IMPACT_LEVEL_30); - watchdog.registerHealthObserver(bootObserver); + watchdog.registerHealthObserver(bootObserver, mTestExecutor); for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT - 1; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); assertThat(bootObserver.mitigatedBootLoop()).isFalse(); } @@ -1286,11 +1344,12 @@ public class PackageWatchdogTest { bootObserver1.setImpact(PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); TestObserver bootObserver2 = new TestObserver(OBSERVER_NAME_2); bootObserver2.setImpact(PackageHealthObserverImpact.USER_IMPACT_LEVEL_30); - watchdog.registerHealthObserver(bootObserver1); - watchdog.registerHealthObserver(bootObserver2); + watchdog.registerHealthObserver(bootObserver1, mTestExecutor); + watchdog.registerHealthObserver(bootObserver2, mTestExecutor); for (int i = 0; i < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); assertThat(bootObserver1.mitigatedBootLoop()).isTrue(); assertThat(bootObserver2.mitigatedBootLoop()).isFalse(); } @@ -1302,11 +1361,12 @@ public class PackageWatchdogTest { bootObserver1.setImpact(PackageHealthObserverImpact.USER_IMPACT_LEVEL_10); TestObserver bootObserver2 = new TestObserver(OBSERVER_NAME_2); bootObserver2.setImpact(PackageHealthObserverImpact.USER_IMPACT_LEVEL_30); - watchdog.registerHealthObserver(bootObserver1); - watchdog.registerHealthObserver(bootObserver2); + watchdog.registerHealthObserver(bootObserver1, mTestExecutor); + watchdog.registerHealthObserver(bootObserver2, mTestExecutor); for (int i = 0; i < 15; i++) { watchdog.noteBoot(); } + mTestLooper.dispatchAll(); assertThat(bootObserver1.mitigatedBootLoop()).isTrue(); assertThat(bootObserver2.mitigatedBootLoop()).isFalse(); } @@ -1319,7 +1379,7 @@ public class PackageWatchdogTest { mSetFlagsRule.disableFlags(Flags.FLAG_RECOVERABILITY_DETECTION); PackageWatchdog watchdog = createWatchdog(); TestObserver bootObserver = new TestObserver(OBSERVER_NAME_1); - watchdog.registerHealthObserver(bootObserver); + watchdog.registerHealthObserver(bootObserver, mTestExecutor); for (int i = 0; i < 4; i++) { for (int j = 0; j < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT; j++) { watchdog.noteBoot(); @@ -1333,7 +1393,7 @@ public class PackageWatchdogTest { watchdog.noteBoot(); } } - + mTestLooper.dispatchAll(); assertThat(bootObserver.mBootMitigationCounts).isEqualTo(List.of(1, 2, 3, 4, 1, 2, 3, 4)); } @@ -1342,7 +1402,7 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(); TestObserver bootObserver = new TestObserver(OBSERVER_NAME_1, PackageHealthObserverImpact.USER_IMPACT_LEVEL_30); - watchdog.registerHealthObserver(bootObserver); + watchdog.registerHealthObserver(bootObserver, mTestExecutor); for (int j = 0; j < PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT - 1; j++) { watchdog.noteBoot(); } @@ -1358,7 +1418,7 @@ public class PackageWatchdogTest { for (int i = 0; i < 4; i++) { watchdog.noteBoot(); } - + mTestLooper.dispatchAll(); assertThat(bootObserver.mBootMitigationCounts).isEqualTo(List.of(1, 2, 3, 4, 1, 2, 3, 4)); } @@ -1370,7 +1430,8 @@ public class PackageWatchdogTest { public void testNullFailedPackagesList() { PackageWatchdog watchdog = createWatchdog(); TestObserver observer1 = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer1, List.of(APP_A), LONG_DURATION); + watchdog.registerHealthObserver(observer1, mTestExecutor); + watchdog.startExplicitHealthCheck(observer1, List.of(APP_A), LONG_DURATION); raiseFatalFailureAndDispatch(watchdog, null, PackageWatchdog.FAILURE_REASON_APP_CRASH); assertThat(observer1.mMitigatedPackages).isEmpty(); @@ -1388,18 +1449,18 @@ public class PackageWatchdogTest { PackageWatchdog watchdog = createWatchdog(testController, true); TestObserver testObserver1 = new TestObserver(OBSERVER_NAME_1); - watchdog.registerHealthObserver(testObserver1); - watchdog.startObservingHealth(testObserver1, List.of(APP_A), LONG_DURATION); + watchdog.registerHealthObserver(testObserver1, mTestExecutor); + watchdog.startExplicitHealthCheck(testObserver1, List.of(APP_A), LONG_DURATION); mTestLooper.dispatchAll(); TestObserver testObserver2 = new TestObserver(OBSERVER_NAME_2); - watchdog.registerHealthObserver(testObserver2); - watchdog.startObservingHealth(testObserver2, List.of(APP_B), LONG_DURATION); + watchdog.registerHealthObserver(testObserver2, mTestExecutor); + watchdog.startExplicitHealthCheck(testObserver2, List.of(APP_B), LONG_DURATION); mTestLooper.dispatchAll(); TestObserver testObserver3 = new TestObserver(OBSERVER_NAME_3); - watchdog.registerHealthObserver(testObserver3); - watchdog.startObservingHealth(testObserver3, List.of(APP_C), LONG_DURATION); + watchdog.registerHealthObserver(testObserver3, mTestExecutor); + watchdog.startExplicitHealthCheck(testObserver3, List.of(APP_C), LONG_DURATION); mTestLooper.dispatchAll(); watchdog.unregisterHealthObserver(testObserver1); @@ -1431,14 +1492,15 @@ public class PackageWatchdogTest { public void testFailureHistoryIsPreserved() { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, List.of(APP_A), SHORT_DURATION); + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, List.of(APP_A), SHORT_DURATION); for (int i = 0; i < PackageWatchdog.DEFAULT_TRIGGER_FAILURE_COUNT - 1; i++) { watchdog.notifyPackageFailure(List.of(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_UNKNOWN); } mTestLooper.dispatchAll(); assertThat(observer.mMitigatedPackages).isEmpty(); - watchdog.startObservingHealth(observer, List.of(APP_A), LONG_DURATION); + watchdog.startExplicitHealthCheck(observer, List.of(APP_A), LONG_DURATION); watchdog.notifyPackageFailure(List.of(new VersionedPackage(APP_A, VERSION_CODE)), PackageWatchdog.FAILURE_REASON_UNKNOWN); mTestLooper.dispatchAll(); @@ -1453,7 +1515,8 @@ public class PackageWatchdogTest { public void testMitigationSlidingWindow() { PackageWatchdog watchdog = createWatchdog(); TestObserver observer = new TestObserver(OBSERVER_NAME_1); - watchdog.startObservingHealth(observer, List.of(APP_A), + watchdog.registerHealthObserver(observer, mTestExecutor); + watchdog.startExplicitHealthCheck(observer, List.of(APP_A), PackageWatchdog.DEFAULT_OBSERVING_DURATION_MS * 2); @@ -1895,6 +1958,7 @@ public class PackageWatchdogTest { } public boolean onExecuteBootLoopMitigation(int level) { + Slog.w("hrm1243", "I'm here " + level); mMitigatedBootLoop = true; mBootMitigationCounts.add(level); return true; diff --git a/tests/graphics/SilkFX/AndroidManifest.xml b/tests/graphics/SilkFX/AndroidManifest.xml index 25092b52e2b6..c293589bdbaf 100644 --- a/tests/graphics/SilkFX/AndroidManifest.xml +++ b/tests/graphics/SilkFX/AndroidManifest.xml @@ -23,13 +23,12 @@ <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" /> <application android:label="SilkFX" - android:theme="@style/Theme.UsefulDefault"> + android:theme="@android:style/Theme.Material"> <activity android:name=".Main" android:label="SilkFX Demos" android:banner="@drawable/background1" - android:exported="true" - android:theme="@style/Theme.UsefulDefault"> + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.DEFAULT"/> diff --git a/tests/graphics/SilkFX/res/layout/activity_background_blur.xml b/tests/graphics/SilkFX/res/layout/activity_background_blur.xml index f13c0883cb01..27eca82dcb23 100644 --- a/tests/graphics/SilkFX/res/layout/activity_background_blur.xml +++ b/tests/graphics/SilkFX/res/layout/activity_background_blur.xml @@ -13,161 +13,168 @@ ~ 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" +--> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/background" - android:layout_width="390dp" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:padding="15dp" - android:orientation="vertical" + android:fitsSystemWindows="true" + android:layout_width="match_parent" + android:layout_height="match_parent" tools:context=".materials.BackgroundBlurActivity"> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:padding="10dp" - android:textColor="#ffffffff" - android:text="Hello blurry world!"/> - <LinearLayout - android:layout_width="match_parent" + android:id="@+id/background" + android:layout_width="390dp" android:layout_height="wrap_content" - android:orientation="horizontal"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textColor="#ffffffff" - android:text="Background blur"/> + android:layout_gravity="center" + android:padding="15dp" + android:orientation="vertical"> - <SeekBar - android:id="@+id/set_background_blur" - android:min="0" - android:max="300" - android:layout_width="160dp" - android:layout_height="wrap_content"/> - <TextView - android:id="@+id/background_blur_radius" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="#ffffffff" - android:ems="3" - android:gravity="center" - android:paddingLeft="10dp" - android:paddingRight="10dp" - android:text="TODO"/> - </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> <TextView - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" + android:gravity="center_horizontal" + android:padding="10dp" android:textColor="#ffffffff" - android:text="Background alpha"/> + android:text="Hello blurry world!"/> - <SeekBar - android:id="@+id/set_background_alpha" - android:min="0" - android:max="100" - android:layout_width="160dp" - android:layout_height="wrap_content" /> - <TextView - android:id="@+id/background_alpha" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="#ffffffff" - android:ems="3" - android:gravity="center" - android:paddingLeft="10dp" - android:paddingRight="10dp" - android:text="TODO"/> - </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <TextView - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:textColor="#ffffffff" - android:text="Blur behind"/> + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textColor="#ffffffff" + android:text="Background blur"/> - <SeekBar - android:id="@+id/set_blur_behind" - android:min="0" - android:max="300" - android:layout_width="160dp" - android:layout_height="wrap_content" /> - <TextView - android:id="@+id/blur_behind_radius" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" - android:textColor="#ffffffff" - android:paddingLeft="10dp" - android:paddingRight="10dp" - android:ems="3" - android:text="TODO"/> - </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <TextView - android:layout_width="wrap_content" + <SeekBar + android:id="@+id/set_background_blur" + android:min="0" + android:max="300" + android:layout_width="160dp" + android:layout_height="wrap_content"/> + <TextView + android:id="@+id/background_blur_radius" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="#ffffffff" + android:ems="3" + android:gravity="center" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:text="TODO"/> + </LinearLayout> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:textColor="#ffffffff" - android:text="Dim amount"/> + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textColor="#ffffffff" + android:text="Background alpha"/> - <SeekBar - android:id="@+id/set_dim_amount" - android:min="0" - android:max="100" - android:layout_width="160dp" - android:layout_height="wrap_content" /> - <TextView - android:id="@+id/dim_amount" - android:layout_width="wrap_content" + <SeekBar + android:id="@+id/set_background_alpha" + android:min="0" + android:max="100" + android:layout_width="160dp" + android:layout_height="wrap_content" /> + <TextView + android:id="@+id/background_alpha" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="#ffffffff" + android:ems="3" + android:gravity="center" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:text="TODO"/> + </LinearLayout> + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center" - android:textColor="#ffffffff" - android:paddingLeft="10dp" - android:paddingRight="10dp" - android:ems="3" - android:text="TODO"/> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="5dp" - android:orientation="vertical" - android:gravity="center"> + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textColor="#ffffffff" + android:text="Blur behind"/> - <Button - android:id="@+id/toggle_blur_enabled" + <SeekBar + android:id="@+id/set_blur_behind" + android:min="0" + android:max="300" + android:layout_width="160dp" + android:layout_height="wrap_content" /> + <TextView + android:id="@+id/blur_behind_radius" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:textColor="#ffffffff" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:ems="3" + android:text="TODO"/> + </LinearLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Disable blur" - android:onClick="toggleForceBlurDisabled"/> + android:orientation="horizontal"> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textColor="#ffffffff" + android:text="Dim amount"/> - <Button - android:id="@+id/toggle_battery_saving_mode" + <SeekBar + android:id="@+id/set_dim_amount" + android:min="0" + android:max="100" + android:layout_width="160dp" + android:layout_height="wrap_content" /> + <TextView + android:id="@+id/dim_amount" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:textColor="#ffffffff" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:ems="3" + android:text="TODO"/> + </LinearLayout> + + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="TODO" - android:onClick="toggleBatterySavingMode"/> - </LinearLayout> - <requestFocus/> + android:layout_gravity="center" + android:layout_marginTop="5dp" + android:orientation="vertical" + android:gravity="center"> + + <Button + android:id="@+id/toggle_blur_enabled" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Disable blur" + android:onClick="toggleForceBlurDisabled"/> -</LinearLayout> + <Button + android:id="@+id/toggle_battery_saving_mode" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="TODO" + android:onClick="toggleBatterySavingMode"/> + </LinearLayout> + <requestFocus/> + + </LinearLayout> +</FrameLayout> diff --git a/tests/graphics/SilkFX/res/layout/activity_glass.xml b/tests/graphics/SilkFX/res/layout/activity_glass.xml index aa09f276d5c8..d591fc4606b0 100644 --- a/tests/graphics/SilkFX/res/layout/activity_glass.xml +++ b/tests/graphics/SilkFX/res/layout/activity_glass.xml @@ -19,6 +19,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:fitsSystemWindows="true" tools:context=".MainActivity"> <ImageView @@ -300,4 +301,4 @@ </androidx.constraintlayout.widget.ConstraintLayout> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/tests/graphics/SilkFX/res/layout/color_mode_controls.xml b/tests/graphics/SilkFX/res/layout/color_mode_controls.xml index c0c0bab8a605..9b2b0c818a8e 100644 --- a/tests/graphics/SilkFX/res/layout/color_mode_controls.xml +++ b/tests/graphics/SilkFX/res/layout/color_mode_controls.xml @@ -19,6 +19,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_margin="8dp" android:orientation="vertical"> <TextView @@ -61,4 +62,4 @@ </LinearLayout> -</com.android.test.silkfx.common.ColorModeControls>
\ No newline at end of file +</com.android.test.silkfx.common.ColorModeControls> diff --git a/tests/graphics/SilkFX/res/layout/common_base.xml b/tests/graphics/SilkFX/res/layout/common_base.xml index c0eaf9bc1476..ce6d850af1bc 100644 --- a/tests/graphics/SilkFX/res/layout/common_base.xml +++ b/tests/graphics/SilkFX/res/layout/common_base.xml @@ -18,6 +18,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + android:fitsSystemWindows="true" android:orientation="vertical"> <include layout="@layout/color_mode_controls" /> @@ -26,4 +27,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/tests/graphics/SilkFX/res/layout/hdr_glows.xml b/tests/graphics/SilkFX/res/layout/hdr_glows.xml index b6050645866a..f1e553a3df23 100644 --- a/tests/graphics/SilkFX/res/layout/hdr_glows.xml +++ b/tests/graphics/SilkFX/res/layout/hdr_glows.xml @@ -18,6 +18,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + android:fitsSystemWindows="true" android:orientation="vertical"> <include layout="@layout/color_mode_controls" /> @@ -48,4 +49,4 @@ android:layout_height="50dp" android:layout_margin="8dp" /> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/tests/graphics/SilkFX/res/values/style.xml b/tests/graphics/SilkFX/res/values/style.xml index 4dd626dfb8f5..75506978024b 100644 --- a/tests/graphics/SilkFX/res/values/style.xml +++ b/tests/graphics/SilkFX/res/values/style.xml @@ -16,21 +16,16 @@ --> <!-- Styles for immersive actions UI. --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> - <style name="Theme.BackgroundBlurTheme" parent= "Theme.AppCompat.Dialog"> + <style name="Theme.BackgroundBlurTheme" parent="Theme.AppCompat.Dialog"> <item name="android:windowIsTranslucent">true</item> <item name="android:windowBlurBehindEnabled">true</item> <item name="android:backgroundDimEnabled">false</item> <item name="android:windowElevation">0dp</item> <item name="buttonStyle">@style/AppTheme.Button</item> <item name="colorAccent">#bbffffff</item> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> </style> <style name="AppTheme.Button" parent="Widget.AppCompat.Button"> <item name="android:textColor">#ffffffff</item> </style> - <style name="Theme.UsefulDefault" parent="android:Theme.Material"> - <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item> - </style> - </resources> diff --git a/tests/graphics/SilkFX/src/com/android/test/silkfx/Main.kt b/tests/graphics/SilkFX/src/com/android/test/silkfx/Main.kt index 6b6d3b8d3d12..ad7cde44bb35 100644 --- a/tests/graphics/SilkFX/src/com/android/test/silkfx/Main.kt +++ b/tests/graphics/SilkFX/src/com/android/test/silkfx/Main.kt @@ -72,6 +72,7 @@ class Main : Activity() { super.onCreate(savedInstanceState) val list = ExpandableListView(this) + list.setFitsSystemWindows(true) setContentView(list) diff --git a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java index 76be232c2fe3..74db6a5211a0 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java @@ -659,7 +659,6 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection private void verifySetSafeModeAlarm( boolean safeModeEnabledByCaller, - boolean safeModeConfigFlagEnabled, boolean expectingSafeModeEnabled) throws Exception { final VcnGatewayConnectionConfig config = @@ -670,7 +669,6 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection mock(VcnGatewayConnection.Dependencies.class); setUpWakeupMessage( mSafeModeTimeoutAlarm, VcnGatewayConnection.SAFEMODE_TIMEOUT_ALARM, deps); - doReturn(safeModeConfigFlagEnabled).when(mFeatureFlags).safeModeConfig(); final VcnGatewayConnection connection = new VcnGatewayConnection( @@ -694,37 +692,19 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection } @Test - public void testSafeModeEnabled_configFlagEnabled() throws Exception { + public void testSafeModeEnabled() throws Exception { verifySetSafeModeAlarm( true /* safeModeEnabledByCaller */, - true /* safeModeConfigFlagEnabled */, true /* expectingSafeModeEnabled */); } @Test - public void testSafeModeEnabled_configFlagDisabled() throws Exception { - verifySetSafeModeAlarm( - true /* safeModeEnabledByCaller */, - false /* safeModeConfigFlagEnabled */, - true /* expectingSafeModeEnabled */); - } - - @Test - public void testSafeModeDisabled_configFlagEnabled() throws Exception { + public void testSafeModeDisabled() throws Exception { verifySetSafeModeAlarm( false /* safeModeEnabledByCaller */, - true /* safeModeConfigFlagEnabled */, false /* expectingSafeModeEnabled */); } - @Test - public void testSafeModeDisabled_configFlagDisabled() throws Exception { - verifySetSafeModeAlarm( - false /* safeModeEnabledByCaller */, - false /* safeModeConfigFlagEnabled */, - true /* expectingSafeModeEnabled */); - } - private Consumer<VcnNetworkAgent> setupNetworkAndGetUnwantedCallback() { triggerChildOpened(); mTestLooper.dispatchAll(); diff --git a/tools/processors/property_cache/src/java/android/processor/property_cache/CachedPropertyProcessor.java b/tools/processors/property_cache/src/java/android/processor/property_cache/CachedPropertyProcessor.java index 03610128d269..c438163948fc 100644 --- a/tools/processors/property_cache/src/java/android/processor/property_cache/CachedPropertyProcessor.java +++ b/tools/processors/property_cache/src/java/android/processor/property_cache/CachedPropertyProcessor.java @@ -30,6 +30,7 @@ import java.util.Set; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Filer; import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.TypeElement; @@ -42,6 +43,11 @@ public class CachedPropertyProcessor extends AbstractProcessor { new IpcDataCacheComposer(); @Override + public SourceVersion getSupportedSourceVersion() { + return SourceVersion.latestSupported(); + } + + @Override public Set<String> getSupportedAnnotationTypes() { return new HashSet<String>( ImmutableSet.of(CachedPropertyDefaults.class.getCanonicalName())); |